* [gentoo-commits] gentoo-x86 commit in sci-libs/pgplot/files: pgplot-makemake.patch
@ 2008-11-07 12:56 Sebastien Fabbro (bicatali)
0 siblings, 0 replies; 2+ messages in thread
From: Sebastien Fabbro (bicatali) @ 2008-11-07 12:56 UTC (permalink / raw
To: gentoo-commits
bicatali 08/11/07 12:56:55
Modified: pgplot-makemake.patch
Log:
Fixed for parallel build
(Portage version: 2.2_rc12/cvs/Linux 2.6.25-gentoo-r7 x86_64)
Revision Changes Path
1.3 sci-libs/pgplot/files/pgplot-makemake.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/pgplot/files/pgplot-makemake.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/pgplot/files/pgplot-makemake.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/pgplot/files/pgplot-makemake.patch?r1=1.2&r2=1.3
Index: pgplot-makemake.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/pgplot/files/pgplot-makemake.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pgplot-makemake.patch 5 Nov 2008 21:50:18 -0000 1.2
+++ pgplot-makemake.patch 7 Nov 2008 12:56:54 -0000 1.3
@@ -1,5 +1,35 @@
---- makemake.orig 2008-10-29 15:32:12.000000000 +0000
-+++ makemake 2008-10-29 20:08:59.000000000 +0000
+--- makemake.orig 2008-11-07 12:53:03.000000000 +0000
++++ makemake 2008-11-07 12:52:33.000000000 +0000
+@@ -73,7 +73,7 @@
+
+ # List the default make targets.
+
+-DEFAULT_TARGETS="lib grfont.dat prog pgplot.doc"
++DEFAULT_TARGETS="lib grfont.dat pgplot.doc"
+
+ # Get the configuration variables.
+
+@@ -199,17 +199,17 @@
+ fi
+
+ if (echo $DRIV_LIST | grep -s xmdriv 2>&1 1>/dev/null); then
+- DEFAULT_TARGETS="$DEFAULT_TARGETS libXmPgplot.a pgmdemo"
++ DEFAULT_TARGETS="$DEFAULT_TARGETS libXmPgplot.a"
+ INSTALL_LIST="$INSTALL_LIST libXmPgplot.a XmPgplot.h"
+ fi
+
+ if (echo $DRIV_LIST | grep -s xadriv 2>&1 1>/dev/null); then
+- DEFAULT_TARGETS="$DEFAULT_TARGETS libXaPgplot.a pgawdemo"
++ DEFAULT_TARGETS="$DEFAULT_TARGETS libXaPgplot.a"
+ INSTALL_LIST="$INSTALL_LIST libXaPgplot.a XaPgplot.h"
+ fi
+
+ if (echo $DRIV_LIST | grep -s tkdriv 2>&1 1>/dev/null); then
+- DEFAULT_TARGETS="$DEFAULT_TARGETS libtkpgplot.a pgtkdemo pgtkdemo.tcl"
++ DEFAULT_TARGETS="$DEFAULT_TARGETS libtkpgplot.a"
+ INSTALL_LIST="$INSTALL_LIST libtkpgplot.a tkpgplot.h"
+ fi
+
@@ -622,7 +622,7 @@
# Fortran compiler and compilation flags
#
@@ -18,16 +48,18 @@
CFLAGD=$CFLAGD
MCOMPL=$MCOMPL
MFLAGC=$MFLAGC
-@@ -658,6 +658,8 @@
+@@ -657,7 +657,10 @@
+ # Shared library creation.
#
SHARED_LIB=$SHARED_LIB
++SHARED_CLIB=$SHARED_CLIB
SHARED_LD=$SHARED_LD
+SHARED_LD_PGPLOT_OPTS=$SHARED_LD_PGPLOT_OPTS
+SHARED_LD_CPGPLOT_OPTS=$SHARED_LD_CPGPLOT_OPTS
#
# The libraries that the shared PGPLOT library depends upon.
# This is for systems that allow one to specify what libraries
-@@ -806,7 +808,8 @@
+@@ -806,7 +809,8 @@
# libraries.
#-----------------------------------------------------------------------
@@ -37,7 +69,7 @@
libpgplot.a : $(PG_ROUTINES) $(PG_NON_STANDARD) $(GR_ROUTINES) \
$(DISPATCH_ROUTINE) $(DRIVERS) $(SYSTEM_ROUTINES)
-@@ -816,6 +819,16 @@
+@@ -816,6 +820,16 @@
$(DRIVERS) $(SYSTEM_ROUTINES) | sort | uniq`
$(RANLIB) libpgplot.a
@@ -50,11 +82,11 @@
+ $(SHARED_LD) $(SHARED_LD_PGPLOT_OPTS) `ls $(PG_ROUTINES) \
+ $(PG_NON_STANDARD) $(GR_ROUTINES) $(DISPATCH_ROUTINE) \
+ $(DRIVERS) $(SYSTEM_ROUTINES) | sort | uniq` $(SHARED_LIB_LIBS)
-+
++ ln -s $(SHARED_LIB) libpgplot.so
EOD
# Emit the shared library dependency if requested.
-@@ -824,7 +837,7 @@
+@@ -824,7 +838,7 @@
cat >> makefile << \EOD
$(SHARED_LIB): $(PG_ROUTINES) $(PG_NON_STANDARD) \
$(GR_ROUTINES) $(DISPATCH_ROUTINE) $(DRIVERS) $(SYSTEM_ROUTINES)
@@ -63,7 +95,7 @@
$(PG_NON_STANDARD) $(GR_ROUTINES) $(DISPATCH_ROUTINE) \
$(DRIVERS) $(SYSTEM_ROUTINES) | sort | uniq` $(SHARED_LIB_LIBS)
EOD
-@@ -1025,7 +1038,7 @@
+@@ -1025,12 +1039,12 @@
grivas.o : $(DRVDIR)/gadef.h
grtv00.o : $(DRVDIR)/imdef.h
pgxwin.o : $(DRVDIR)/pgxwin.h
@@ -72,7 +104,13 @@
x2driv.o figdisp_comm.o: $(DRVDIR)/commands.h
-@@ -1039,6 +1052,8 @@
+
+-cpg: libcpgplot.a cpgplot.h cpgdemo
++cpg: cpgplot.h libcpgplot.a
+ @echo ' '
+ @echo '*** Finished compilation of the C PGPLOT wrapper library ***'
+ @echo ' '
+@@ -1039,17 +1053,29 @@
@echo 'will be needed.'
@echo ' '
@@ -81,7 +119,14 @@
pgbind: $(SRC)/cpg/pgbind.c
$(CCOMPL) $(CFLAGC) $(SRC)/cpg/pgbind.c -o pgbind
-@@ -1050,6 +1065,13 @@
+-libcpgplot.a cpgplot.h: $(PG_SOURCE) pgbind
++cpgplot.h: $(PG_SOURCE) pgbind
+ ./pgbind $(PGBIND_FLAGS) -h -w $(PG_SOURCE)
++
++libcpgplot.a: cpgplot.h
+ $(CCOMPL) -c $(CFLAGC) cpg*.c
+ rm -f cpg*.c
+ ar ru libcpgplot.a cpg*.o
$(RANLIB) libcpgplot.a
rm -f cpg*.o
@@ -90,6 +135,7 @@
+ $(CCOMPL) -c $(CFLAGC) cpg*.c
+ rm -f cpg*.c
+ $(SHARED_LD) $(SHARED_LD_CPGPLOT_OPTS) cpg*.o -lpgplot $(SHARED_LIB_LIBS)
++ ln -s $(SHARED_CLIB) libcpgplot.so
+ rm -f cpg*.o
+
cpgdemo: cpgplot.h $(SRC)/cpg/cpgdemo.c libcpgplot.a
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-libs/pgplot/files: pgplot-makemake.patch
@ 2012-08-17 20:59 Sebastien Fabbro (bicatali)
0 siblings, 0 replies; 2+ messages in thread
From: Sebastien Fabbro (bicatali) @ 2012-08-17 20:59 UTC (permalink / raw
To: gentoo-commits
bicatali 12/08/17 20:59:10
Modified: pgplot-makemake.patch
Log:
Fixed soname when tk or motif flags are on, bug #425496
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Revision Changes Path
1.6 sci-libs/pgplot/files/pgplot-makemake.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/pgplot/files/pgplot-makemake.patch?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/pgplot/files/pgplot-makemake.patch?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/pgplot/files/pgplot-makemake.patch?r1=1.5&r2=1.6
Index: pgplot-makemake.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/pgplot/files/pgplot-makemake.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pgplot-makemake.patch 5 Jul 2012 22:00:11 -0000 1.5
+++ pgplot-makemake.patch 17 Aug 2012 20:59:10 -0000 1.6
@@ -128,7 +128,7 @@
$(RANLIB) libXmPgplot.a
+libXmPgplot.so: XmPgplot.h XmPgplot.o
-+ $(SHARED_LD) $(SHARED_LD_CPGPLOT_OPTS) XmPgplot.o -L. -lcpgplot $(MOTIF_LIBS) -o libXmPgplot.so.5
++ $(SHARED_LD) $(LDFLAGS) -Wl,-soname,libXmPgplot.so.5 XmPgplot.o -L. -lcpgplot $(MOTIF_LIBS) -o libXmPgplot.so.5
+ ln -s libXmPgplot.so.5 libXmPgplot.so
+
XmPgplot.h: $(XMDIR)/XmPgplot.h
@@ -139,7 +139,7 @@
$(RANLIB) libtkpgplot.a
+libtkpgplot.so: tkpgplot.h tkpgplot.o
-+ $(SHARED_LD) $(SHARED_LD_CPGPLOT_OPTS) tkpgplot.o -L. -lcpgplot $(TK_LIBS) -o libtkpgplot.so.5
++ $(SHARED_LD) $(LDFLAGS) -Wl,-soname,libtkpgplot.so.5 tkpgplot.o -L. -lcpgplot $(TK_LIBS) -o libtkpgplot.so.5
+ ln -s libtkpgplot.so.5 libtkpgplot.so
+
tkpgplot.h: $(TKDIR)/tkpgplot.h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-08-17 20:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-07 12:56 [gentoo-commits] gentoo-x86 commit in sci-libs/pgplot/files: pgplot-makemake.patch Sebastien Fabbro (bicatali)
-- strict thread matches above, loose matches on Subject: below --
2012-08-17 20:59 Sebastien Fabbro (bicatali)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox