From c5e7ff331b665f9f8c5da83dfb0bb3b7138d2659 Mon Sep 17 00:00:00 2001
From: Sebastien Fabbro <bicatali@gentoo.org>
Date: Sat, 5 Mar 2011 18:20:52 +0000
Subject: Initial import into the main tree. Rewrote from scratch.

(Portage version: 2.1.9.42/cvs/Linux x86_64)
---
 sci-libs/spooles/files/Make.inc.in                 |  9 +++++
 .../spooles/files/spooles-2.2-I2Ohash-64bit.patch  | 28 +++++++++++++
 sci-libs/spooles/files/spooles-2.2-formats.patch   | 17 ++++++++
 sci-libs/spooles/files/spooles-2.2-makefiles.patch | 47 ++++++++++++++++++++++
 4 files changed, 101 insertions(+)
 create mode 100644 sci-libs/spooles/files/Make.inc.in
 create mode 100644 sci-libs/spooles/files/spooles-2.2-I2Ohash-64bit.patch
 create mode 100644 sci-libs/spooles/files/spooles-2.2-formats.patch
 create mode 100644 sci-libs/spooles/files/spooles-2.2-makefiles.patch

(limited to 'sci-libs/spooles/files')

diff --git a/sci-libs/spooles/files/Make.inc.in b/sci-libs/spooles/files/Make.inc.in
new file mode 100644
index 000000000000..1557f9fe979e
--- /dev/null
+++ b/sci-libs/spooles/files/Make.inc.in
@@ -0,0 +1,9 @@
+.POSIX:
+THREAD_LIBS = -lpthread
+CC = @CC@
+AR = @AR@
+RANLIB = @RANLIB@
+ARFLAGS = rv
+.c.a :
+	$(CC) $(CFLAGS) -c $<
+	$(AR) $(ARFLAGS) $@ $*.o
diff --git a/sci-libs/spooles/files/spooles-2.2-I2Ohash-64bit.patch b/sci-libs/spooles/files/spooles-2.2-I2Ohash-64bit.patch
new file mode 100644
index 000000000000..0f608da2afc8
--- /dev/null
+++ b/sci-libs/spooles/files/spooles-2.2-I2Ohash-64bit.patch
@@ -0,0 +1,28 @@
+--- spooles-2.2/I2Ohash/src/util.c~	1998-05-30 18:45:12.000000000 -0400
++++ spooles-2.2/I2Ohash/src/util.c	2008-06-28 20:56:49.000000000 -0400
+@@ -39,9 +39,10 @@
+ */
+ loc1 = (key1 + 1) % hashtable->nlist ;
+ loc2 = (key2 + 1) % hashtable->nlist ;
+-loc  = (loc1*loc2) % hashtable->nlist ;
++long int loc3  = (long int)loc1*(long int)loc2 % hashtable->nlist ;
++loc =(int) loc3;
+ #if MYDEBUG > 0
+-fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %d", loc1, loc2, loc) ;
++fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %ld, loc = %d", loc1, loc2, loc3, loc) ;
+ fflush(stdout) ;
+ #endif
+ /*
+@@ -158,9 +159,10 @@
+ #endif
+ loc1 = (key1 + 1) % hashtable->nlist ;
+ loc2 = (key2 + 1) % hashtable->nlist ;
+-loc  = (loc1*loc2) % hashtable->nlist ;
++long int loc3  = (long int)loc1*(long int)loc2 % hashtable->nlist ;
++loc =(int) loc3;
+ #if MYDEBUG > 0
+-fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %d", loc1, loc2, loc) ;
++fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %ld, loc = %d", loc1, loc2, loc3, loc) ;
+ fflush(stdout) ;
+ #endif
+ /*
diff --git a/sci-libs/spooles/files/spooles-2.2-formats.patch b/sci-libs/spooles/files/spooles-2.2-formats.patch
new file mode 100644
index 000000000000..080574e730d0
--- /dev/null
+++ b/sci-libs/spooles/files/spooles-2.2-formats.patch
@@ -0,0 +1,17 @@
+--- SolveMap/src/setup.c.orig	2011-03-05 18:08:51.000000000 +0000
++++ SolveMap/src/setup.c	2011-03-05 18:16:50.000000000 +0000
+@@ -28,12 +28,12 @@
+    ---------------
+ */
+ if ( solvemap == NULL ) {
+-   fprintf(stderr, "\n fatal error in SolveMap_forwardSetup(%p,%d)"
++   fprintf(stderr, "\n fatal error in SolveMap_forwardSetup"
+            "\n solvemap is NULL\n") ;
+    exit(-1) ;
+ }
+ if ( myid < 0 || myid >= solvemap->nproc ) {
+-   fprintf(stderr, "\n fatal error in SolveMap_forwardSetup(%p,%d)"
++   fprintf(stderr, "\n fatal error in SolveMap_forwardSetup"
+            "\n myid %d, solvemap->nproc %d\n", myid, solvemap->nproc) ;
+    exit(-1) ;
+ }
diff --git a/sci-libs/spooles/files/spooles-2.2-makefiles.patch b/sci-libs/spooles/files/spooles-2.2-makefiles.patch
new file mode 100644
index 000000000000..4af8e083736c
--- /dev/null
+++ b/sci-libs/spooles/files/spooles-2.2-makefiles.patch
@@ -0,0 +1,47 @@
+--- MPI/makefile~	1998-12-17 15:47:44.000000000 +0000
++++ MPI/makefile	2008-02-26 00:10:57.000000000 +0000
+@@ -2,7 +2,7 @@
+ 	cd drivers ; make drivers
+ 
+ lib :
+-	cd src ; make spoolesMPI.a
++	cd src ; make makeLib
+ 
+ clean :
+ 	cd src ; make clean
+--- MPI/src/makefile~	1998-12-16 21:54:41.000000000 +0000
++++ MPI/src/makefile	2008-02-26 00:08:16.000000000 +0000
+@@ -42,3 +42,8 @@
+ 
+ clean :
+ 	- rm -f *.a *.o
++
++makeLib :
++	perl ../../makeLib > makeG
++	make -f makeG
++	rm -f makeG
+--- MT/makefile~	1998-12-17 15:47:48.000000000 +0000
++++ MT/makefile	2008-02-26 00:12:43.000000000 +0000
+@@ -2,7 +2,7 @@
+ 	cd drivers ; make drivers
+ 
+ lib :
+-	cd src ; make spoolesMT.a
++	cd src ; make makeLib
+ 
+ clean :
+ 	cd src ; make clean
+--- makeLib~	2011-03-05 16:44:12.000000000 +0000
++++ makeLib	2011-03-05 17:46:58.000000000 +0000
+@@ -70,8 +70,8 @@
+ .c.o :
+ 	$(PURIFY) $(CC) -c $(CFLAGS) $*.c -o $(OBJ)_$*.o
+ 
+-../../spooles.a : ${OBJ_FILES}
+-	$(AR) $(ARFLAGS) ../../spooles.a $(OBJ)_*.o
++../../libspooles.a : ${OBJ_FILES}
++	$(AR) $(ARFLAGS) ../../libspooles.a $(OBJ)_*.o
+ 	rm -f $(OBJ)_*.o
+-	$(RANLIB) ../../spooles.a
++	$(RANLIB) ../../libspooles.a
+ EOF
-- 
cgit v1.2.3-65-gdbad