| 1 |
bicatali 12/07/05 22:00:11 |
| 2 |
|
| 3 |
Modified: pgplot-makemake.patch |
| 4 |
Removed: pgplot-ldflags.patch |
| 5 |
Log: |
| 6 |
Switch to EAPI4, added static-libs, fixed makemake patch, keyword amd64-linux, x86-linux |
| 7 |
|
| 8 |
(Portage version: 2.2.01.20430-prefix/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.5 sci-libs/pgplot/files/pgplot-makemake.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/pgplot/files/pgplot-makemake.patch?rev=1.5&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/pgplot/files/pgplot-makemake.patch?rev=1.5&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/pgplot/files/pgplot-makemake.patch?r1=1.4&r2=1.5 |
| 16 |
|
| 17 |
Index: pgplot-makemake.patch |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/pgplot/files/pgplot-makemake.patch,v |
| 20 |
retrieving revision 1.4 |
| 21 |
retrieving revision 1.5 |
| 22 |
diff -u -r1.4 -r1.5 |
| 23 |
--- pgplot-makemake.patch 28 Jan 2010 19:00:48 -0000 1.4 |
| 24 |
+++ pgplot-makemake.patch 5 Jul 2012 22:00:11 -0000 1.5 |
| 25 |
@@ -1,5 +1,5 @@ |
| 26 |
---- makemake.orig 2010-01-28 18:57:25.000000000 +0000 |
| 27 |
-+++ makemake 2010-01-28 18:59:06.000000000 +0000 |
| 28 |
+--- makemake.orig 2012-07-05 14:08:30.210815190 -0700 |
| 29 |
++++ makemake 2012-07-05 14:26:28.353381906 -0700 |
| 30 |
@@ -73,7 +73,7 @@ |
| 31 |
|
| 32 |
# List the default make targets. |
| 33 |
@@ -9,13 +9,14 @@ |
| 34 |
|
| 35 |
# Get the configuration variables. |
| 36 |
|
| 37 |
-@@ -199,17 +199,17 @@ |
| 38 |
+@@ -199,18 +199,18 @@ |
| 39 |
fi |
| 40 |
|
| 41 |
if (echo $DRIV_LIST | grep -s xmdriv 2>&1 1>/dev/null); then |
| 42 |
- DEFAULT_TARGETS="$DEFAULT_TARGETS libXmPgplot.a pgmdemo" |
| 43 |
+- INSTALL_LIST="$INSTALL_LIST libXmPgplot.a XmPgplot.h" |
| 44 |
+ DEFAULT_TARGETS="$DEFAULT_TARGETS libXmPgplot.a" |
| 45 |
- INSTALL_LIST="$INSTALL_LIST libXmPgplot.a XmPgplot.h" |
| 46 |
++ INSTALL_LIST="$INSTALL_LIST libXmPgplot.a XmPgplot.h" |
| 47 |
fi |
| 48 |
|
| 49 |
if (echo $DRIV_LIST | grep -s xadriv 2>&1 1>/dev/null); then |
| 50 |
@@ -26,10 +27,12 @@ |
| 51 |
|
| 52 |
if (echo $DRIV_LIST | grep -s tkdriv 2>&1 1>/dev/null); then |
| 53 |
- DEFAULT_TARGETS="$DEFAULT_TARGETS libtkpgplot.a pgtkdemo pgtkdemo.tcl" |
| 54 |
-+ DEFAULT_TARGETS="$DEFAULT_TARGETS libtkpgplot.a" |
| 55 |
- INSTALL_LIST="$INSTALL_LIST libtkpgplot.a tkpgplot.h" |
| 56 |
+- INSTALL_LIST="$INSTALL_LIST libtkpgplot.a tkpgplot.h" |
| 57 |
++ DEFAULT_TARGETS="$DEFAULT_TARGETS libtkpgplot.so" |
| 58 |
++ INSTALL_LIST="$INSTALL_LIST libtkpgplot.a tkpgplot.h" |
| 59 |
fi |
| 60 |
|
| 61 |
+ if (echo $DRIV_LIST | grep -s rvdriv 2>&1 1>/dev/null); then |
| 62 |
@@ -622,7 +622,7 @@ |
| 63 |
# Fortran compiler and compilation flags |
| 64 |
# |
| 65 |
@@ -77,11 +80,11 @@ |
| 66 |
+# $(DISPATCH_ROUTINE) $(DRIVERS) $(SYSTEM_ROUTINES) |
| 67 |
+# $(SHARED_LD) |
| 68 |
+ |
| 69 |
-+shared: $(PG_ROUTINES) $(PG_NON_STANDARD) \ |
| 70 |
++shared: $(PG_ROUTINES) $(PG_NON_STANDARD) grfont.dat \ |
| 71 |
+ $(GR_ROUTINES) $(DISPATCH_ROUTINE) $(DRIVERS) $(SYSTEM_ROUTINES) |
| 72 |
+ $(SHARED_LD) $(SHARED_LD_PGPLOT_OPTS) `ls $(PG_ROUTINES) \ |
| 73 |
+ $(PG_NON_STANDARD) $(GR_ROUTINES) $(DISPATCH_ROUTINE) \ |
| 74 |
-+ $(DRIVERS) $(SYSTEM_ROUTINES) | sort | uniq` -o $(SHARED_LIB) $(SHARED_LIB_LIBS) |
| 75 |
++ $(DRIVERS) $(SYSTEM_ROUTINES) | sort | uniq` $(SHARED_LIB_LIBS) -o $(SHARED_LIB) |
| 76 |
+ ln -s $(SHARED_LIB) libpgplot.so |
| 77 |
EOD |
| 78 |
|
| 79 |
@@ -95,7 +98,63 @@ |
| 80 |
$(PG_NON_STANDARD) $(GR_ROUTINES) $(DISPATCH_ROUTINE) \ |
| 81 |
$(DRIVERS) $(SYSTEM_ROUTINES) | sort | uniq` $(SHARED_LIB_LIBS) |
| 82 |
EOD |
| 83 |
-@@ -1025,12 +1039,12 @@ |
| 84 |
+@@ -857,7 +871,7 @@ |
| 85 |
+ |
| 86 |
+ for file in $DEMOS; do |
| 87 |
+ echo "${file}: \$(DEMDIR)/${file}.f $EXTRA_DEPENDENCY" |
| 88 |
+-echo " \$(FCOMPL) \$(FFLAGD) -o ${file} \$(DEMDIR)/${file}.f \$(PGPLOT_LIB) \$(LIBS)" |
| 89 |
++echo " \$(FCOMPL) \$(FFLAGD) \$(DEMDIR)/${file}.f \$(PGPLOT_LIB) \$(LIBS) -o ${file}" |
| 90 |
+ done >> makefile |
| 91 |
+ |
| 92 |
+ cat >> makefile << \EOD |
| 93 |
+@@ -921,13 +935,13 @@ |
| 94 |
+ # Target "pgxwin_server" is the server program for the XW driver |
| 95 |
+ #----------------------------------------------------------------------- |
| 96 |
+ pgxwin_server: $(DRVDIR)/pgxwin_server.c |
| 97 |
+- $(CCOMPL) $(CFLAGC) $(XINCL) -o pgxwin_server $(DRVDIR)/pgxwin_server.c $(LIBS) |
| 98 |
++ $(CCOMPL) $(CFLAGC) $(LDFLAGS) $(XINCL) $(DRVDIR)/pgxwin_server.c $(LIBS) -o pgxwin_server |
| 99 |
+ |
| 100 |
+ #----------------------------------------------------------------------- |
| 101 |
+ # Target "pgdisp" is the pgdisp server program for /XDISP driver |
| 102 |
+ #----------------------------------------------------------------------- |
| 103 |
+ pgdisp: $(PGDISP_ROUTINES) |
| 104 |
+- $(CCOMPL) $(CFLAGC) -o pgdisp $(PGDISP_ROUTINES) $(LIBS) |
| 105 |
++ $(CCOMPL) $(CFLAGC) $(LDFLAGS) $(PGDISP_ROUTINES) $(LIBS) -o pgdisp |
| 106 |
+ |
| 107 |
+ #----------------------------------------------------------------------- |
| 108 |
+ # Target "libxmpgplot.a" contains the Motif widget driver. |
| 109 |
+@@ -937,6 +951,10 @@ |
| 110 |
+ ar ru libXmPgplot.a XmPgplot.o |
| 111 |
+ $(RANLIB) libXmPgplot.a |
| 112 |
+ |
| 113 |
++libXmPgplot.so: XmPgplot.h XmPgplot.o |
| 114 |
++ $(SHARED_LD) $(SHARED_LD_CPGPLOT_OPTS) XmPgplot.o -L. -lcpgplot $(MOTIF_LIBS) -o libXmPgplot.so.5 |
| 115 |
++ ln -s libXmPgplot.so.5 libXmPgplot.so |
| 116 |
++ |
| 117 |
+ XmPgplot.h: $(XMDIR)/XmPgplot.h |
| 118 |
+ cp $(XMDIR)/XmPgplot.h XmPgplot.h |
| 119 |
+ |
| 120 |
+@@ -965,6 +983,10 @@ |
| 121 |
+ ar ru libtkpgplot.a tkpgplot.o |
| 122 |
+ $(RANLIB) libtkpgplot.a |
| 123 |
+ |
| 124 |
++libtkpgplot.so: tkpgplot.h tkpgplot.o |
| 125 |
++ $(SHARED_LD) $(SHARED_LD_CPGPLOT_OPTS) tkpgplot.o -L. -lcpgplot $(TK_LIBS) -o libtkpgplot.so.5 |
| 126 |
++ ln -s libtkpgplot.so.5 libtkpgplot.so |
| 127 |
++ |
| 128 |
+ tkpgplot.h: $(TKDIR)/tkpgplot.h |
| 129 |
+ cp $(TKDIR)/tkpgplot.h tkpgplot.h |
| 130 |
+ |
| 131 |
+@@ -983,7 +1005,7 @@ |
| 132 |
+ cp $(TKDIR)/rvpgplot.h rvpgplot.h |
| 133 |
+ |
| 134 |
+ rvpgplot.o: $(DRVDIR)/pgxwin.h rvpgplot.h $(TKDIR)/tkpgplot.c |
| 135 |
+- $(CCOMPL) -o $@ -c -DUSE_RIVET $(CFLAGC) -I$(DRVDIR) -I$(TKDIR) $(RV_INCL) $(TKDIR)/tkpgplot.c |
| 136 |
++ $(CCOMPL) -c -DUSE_RIVET $(CFLAGC) -I$(DRVDIR) -I$(TKDIR) $(RV_INCL) $(TKDIR)/tkpgplot.c -o $@ |
| 137 |
+ |
| 138 |
+ #----------------------------------------------------------------------- |
| 139 |
+ # Target "install" is required for Figaro. |
| 140 |
+@@ -1025,12 +1047,12 @@ |
| 141 |
grivas.o : $(DRVDIR)/gadef.h |
| 142 |
grtv00.o : $(DRVDIR)/imdef.h |
| 143 |
pgxwin.o : $(DRVDIR)/pgxwin.h |
| 144 |
@@ -110,7 +169,7 @@ |
| 145 |
@echo ' ' |
| 146 |
@echo '*** Finished compilation of the C PGPLOT wrapper library ***' |
| 147 |
@echo ' ' |
| 148 |
-@@ -1039,17 +1053,29 @@ |
| 149 |
+@@ -1039,24 +1061,36 @@ |
| 150 |
@echo 'will be needed.' |
| 151 |
@echo ' ' |
| 152 |
|
| 153 |
@@ -120,7 +179,7 @@ |
| 154 |
$(CCOMPL) $(CFLAGC) $(SRC)/cpg/pgbind.c -o pgbind |
| 155 |
|
| 156 |
-libcpgplot.a cpgplot.h: $(PG_SOURCE) pgbind |
| 157 |
-+cpgplot.h: $(PG_SOURCE) pgbind |
| 158 |
++cpgplot.h: $(PG_SOURCE) pgbind |
| 159 |
./pgbind $(PGBIND_FLAGS) -h -w $(PG_SOURCE) |
| 160 |
+ |
| 161 |
+libcpgplot.a: cpgplot.h |
| 162 |
@@ -130,14 +189,35 @@ |
| 163 |
$(RANLIB) libcpgplot.a |
| 164 |
rm -f cpg*.o |
| 165 |
|
| 166 |
-+libcpgplot.so: $(PG_SOURCE) pgbind |
| 167 |
++libcpgplot.so: cpgplot.h $(PG_SOURCE) pgbind |
| 168 |
+ ./pgbind $(PGBIND_FLAGS) -w $(PG_SOURCE) |
| 169 |
+ $(CCOMPL) -c $(CFLAGC) cpg*.c |
| 170 |
+ rm -f cpg*.c |
| 171 |
-+ $(SHARED_LD) $(SHARED_LD_CPGPLOT_OPTS) cpg*.o -o $(SHARED_CLIB) -L. -lpgplot $(SHARED_LIB_LIBS) |
| 172 |
++ $(SHARED_LD) $(SHARED_LD_CPGPLOT_OPTS) cpg*.o -L. -lpgplot $(SHARED_LIB_LIBS) -o $(SHARED_CLIB) |
| 173 |
+ ln -s $(SHARED_CLIB) libcpgplot.so |
| 174 |
+ rm -f cpg*.o |
| 175 |
+ |
| 176 |
cpgdemo: cpgplot.h $(SRC)/cpg/cpgdemo.c libcpgplot.a |
| 177 |
$(CCOMPL) $(CFLAGD) -c -I. $(SRC)/cpg/cpgdemo.c |
| 178 |
- $(FCOMPL) -o cpgdemo cpgdemo.o $(CPGPLOT_LIB) $(LIBS) |
| 179 |
+- $(FCOMPL) -o cpgdemo cpgdemo.o $(CPGPLOT_LIB) $(LIBS) |
| 180 |
++ $(FCOMPL) cpgdemo.o $(CPGPLOT_LIB) $(LIBS) -o cpgdemo |
| 181 |
+ rm -f cpgdemo.o |
| 182 |
+ |
| 183 |
+-pgmdemo: pgmdemo.o libXmPgplot.a |
| 184 |
+- $(FCOMPL) -o pgmdemo pgmdemo.o -L`pwd` -lXmPgplot $(CPGPLOT_LIB) $(MOTIF_LIBS) |
| 185 |
++pgmdemo: pgmdemo.o libXmPgplot.so |
| 186 |
++ $(FCOMPL) pgmdemo.o -L`pwd` -lXmPgplot $(CPGPLOT_LIB) $(MOTIF_LIBS) -o pgmdemo |
| 187 |
+ |
| 188 |
+ pgmdemo.o: $(XMDIR)/pgmdemo.c XmPgplot.h libcpgplot.a cpgplot.h |
| 189 |
+ $(CCOMPL) $(CFLAGD) -c -I`pwd` $(MOTIF_INCL) $(XMDIR)/pgmdemo.c |
| 190 |
+@@ -1067,8 +1101,8 @@ |
| 191 |
+ pgawdemo.o: $(XADIR)/pgawdemo.c XaPgplot.h libcpgplot.a cpgplot.h |
| 192 |
+ $(CCOMPL) $(CFLAGD) -c -I`pwd` $(ATHENA_INCL) $(XADIR)/pgawdemo.c |
| 193 |
+ |
| 194 |
+-pgtkdemo: pgtkdemo.o libtkpgplot.a |
| 195 |
+- $(FCOMPL) -o pgtkdemo pgtkdemo.o -L`pwd` -ltkpgplot $(CPGPLOT_LIB) $(TK_LIBS) |
| 196 |
++pgtkdemo: pgtkdemo.o libtkpgplot.so |
| 197 |
++ $(FCOMPL) pgtkdemo.o -L`pwd` -ltkpgplot $(CPGPLOT_LIB) $(TK_LIBS) -o pgtkdemo |
| 198 |
+ |
| 199 |
+ pgtkdemo.tcl: $(TKDIR)/pgtkdemo.tcl |
| 200 |
+ cp $(TKDIR)/pgtkdemo.tcl pgtkdemo.tcl |
Archives