[gentoo-commits] gentoo-x86 commit in sci-libs/spooles/files: spooles-2.2-formats.patch spooles-2.2-I2Ohash-64bit.patch spooles-2.2-makefiles.patch Make.inc.in

[gentoo-commits] gentoo-x86 commit in sci-libs/spooles/files: spooles-2.2-formats.patch spooles-2.2-I2Ohash-64bit.patch spooles-2.2-makefiles.patch Make.inc.in

[Sebastien Fabbro (bicatali)]

bicatali    11/03/05 18:20:52

  Added:                spooles-2.2-formats.patch
                        spooles-2.2-I2Ohash-64bit.patch
                        spooles-2.2-makefiles.patch Make.inc.in
  Log:
  Initial import into the main tree. Rewrote from scratch.
  
  (Portage version: 2.1.9.42/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sci-libs/spooles/files/spooles-2.2-formats.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/spooles/files/spooles-2.2-formats.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/spooles/files/spooles-2.2-formats.patch?rev=1.1&content-type=text/plain

Index: spooles-2.2-formats.patch
===================================================================
--- 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) ;
 }



1.1                  sci-libs/spooles/files/spooles-2.2-I2Ohash-64bit.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/spooles/files/spooles-2.2-I2Ohash-64bit.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/spooles/files/spooles-2.2-I2Ohash-64bit.patch?rev=1.1&content-type=text/plain

Index: spooles-2.2-I2Ohash-64bit.patch
===================================================================
--- 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
 /*



1.1                  sci-libs/spooles/files/spooles-2.2-makefiles.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/spooles/files/spooles-2.2-makefiles.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/spooles/files/spooles-2.2-makefiles.patch?rev=1.1&content-type=text/plain

Index: spooles-2.2-makefiles.patch
===================================================================
--- 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



1.1                  sci-libs/spooles/files/Make.inc.in

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/spooles/files/Make.inc.in?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/spooles/files/Make.inc.in?rev=1.1&content-type=text/plain

Index: Make.inc.in
===================================================================
.POSIX:
THREAD_LIBS = -lpthread
CC = @CC@
AR = @AR@
RANLIB = @RANLIB@
ARFLAGS = rv
.c.a :
	$(CC) $(CFLAGS) -c $<
	$(AR) $(ARFLAGS) $@ $*.o