| 1 |
bicatali 10/01/28 19:00:49 |
| 2 |
|
| 3 |
Modified: pgplot-makemake.patch pgplot-compile-setup.patch |
| 4 |
Log: |
| 5 |
Fixed some orders in the linking process |
| 6 |
(Portage version: 2.2_rc61/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.4 sci-libs/pgplot/files/pgplot-makemake.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/pgplot/files/pgplot-makemake.patch?rev=1.4&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/pgplot/files/pgplot-makemake.patch?rev=1.4&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/pgplot/files/pgplot-makemake.patch?r1=1.3&r2=1.4 |
| 14 |
|
| 15 |
Index: pgplot-makemake.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/pgplot/files/pgplot-makemake.patch,v |
| 18 |
retrieving revision 1.3 |
| 19 |
retrieving revision 1.4 |
| 20 |
diff -u -r1.3 -r1.4 |
| 21 |
--- pgplot-makemake.patch 7 Nov 2008 12:56:54 -0000 1.3 |
| 22 |
+++ pgplot-makemake.patch 28 Jan 2010 19:00:48 -0000 1.4 |
| 23 |
@@ -1,5 +1,5 @@ |
| 24 |
---- makemake.orig 2008-11-07 12:53:03.000000000 +0000 |
| 25 |
-+++ makemake 2008-11-07 12:52:33.000000000 +0000 |
| 26 |
+--- makemake.orig 2010-01-28 18:57:25.000000000 +0000 |
| 27 |
++++ makemake 2010-01-28 18:59:06.000000000 +0000 |
| 28 |
@@ -73,7 +73,7 @@ |
| 29 |
|
| 30 |
# List the default make targets. |
| 31 |
@@ -81,7 +81,7 @@ |
| 32 |
+ $(GR_ROUTINES) $(DISPATCH_ROUTINE) $(DRIVERS) $(SYSTEM_ROUTINES) |
| 33 |
+ $(SHARED_LD) $(SHARED_LD_PGPLOT_OPTS) `ls $(PG_ROUTINES) \ |
| 34 |
+ $(PG_NON_STANDARD) $(GR_ROUTINES) $(DISPATCH_ROUTINE) \ |
| 35 |
-+ $(DRIVERS) $(SYSTEM_ROUTINES) | sort | uniq` $(SHARED_LIB_LIBS) |
| 36 |
++ $(DRIVERS) $(SYSTEM_ROUTINES) | sort | uniq` -o $(SHARED_LIB) $(SHARED_LIB_LIBS) |
| 37 |
+ ln -s $(SHARED_LIB) libpgplot.so |
| 38 |
EOD |
| 39 |
|
| 40 |
@@ -134,7 +134,7 @@ |
| 41 |
+ ./pgbind $(PGBIND_FLAGS) -w $(PG_SOURCE) |
| 42 |
+ $(CCOMPL) -c $(CFLAGC) cpg*.c |
| 43 |
+ rm -f cpg*.c |
| 44 |
-+ $(SHARED_LD) $(SHARED_LD_CPGPLOT_OPTS) cpg*.o -lpgplot $(SHARED_LIB_LIBS) |
| 45 |
++ $(SHARED_LD) $(SHARED_LD_CPGPLOT_OPTS) cpg*.o -o $(SHARED_CLIB) -L. -lpgplot $(SHARED_LIB_LIBS) |
| 46 |
+ ln -s $(SHARED_CLIB) libcpgplot.so |
| 47 |
+ rm -f cpg*.o |
| 48 |
+ |
| 49 |
|
| 50 |
|
| 51 |
|
| 52 |
1.3 sci-libs/pgplot/files/pgplot-compile-setup.patch |
| 53 |
|
| 54 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/pgplot/files/pgplot-compile-setup.patch?rev=1.3&view=markup |
| 55 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/pgplot/files/pgplot-compile-setup.patch?rev=1.3&content-type=text/plain |
| 56 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/pgplot/files/pgplot-compile-setup.patch?r1=1.2&r2=1.3 |
| 57 |
|
| 58 |
Index: pgplot-compile-setup.patch |
| 59 |
=================================================================== |
| 60 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/pgplot/files/pgplot-compile-setup.patch,v |
| 61 |
retrieving revision 1.2 |
| 62 |
retrieving revision 1.3 |
| 63 |
diff -u -r1.2 -r1.3 |
| 64 |
--- pgplot-compile-setup.patch 5 Nov 2008 21:50:18 -0000 1.2 |
| 65 |
+++ pgplot-compile-setup.patch 28 Jan 2010 19:00:48 -0000 1.3 |
| 66 |
@@ -77,9 +77,9 @@ |
| 67 |
# How to create a shared library from a trailing list of object files. |
| 68 |
|
| 69 |
- SHARED_LD="gcc -shared -o $SHARED_LIB" |
| 70 |
-+ SHARED_LD_PGPLOT_OPTS="-o $SHARED_LIB -Wl,-soname,$SHARED_LIB $LDFLAGS" |
| 71 |
++ SHARED_LD_PGPLOT_OPTS="$LDFLAGS -Wl,-soname,$SHARED_LIB" |
| 72 |
+ |
| 73 |
-+ SHARED_LD_CPGPLOT_OPTS="-o $SHARED_CLIB -Wl,-soname,$SHARED_CLIB -L. -lpgplot $LDFLAGS" |
| 74 |
++ SHARED_LD_CPGPLOT_OPTS="$LDFLAGS -Wl,-soname,$SHARED_CLIB" |
| 75 |
+ |
| 76 |
+ SHARED_LD="$FCOMPL -shared" |
Archives