diff options
Diffstat (limited to 'sci-geosciences/gmt/files')
-rw-r--r-- | sci-geosciences/gmt/files/gmt-4.5.6-respect-ldflags.patch | 56 | ||||
-rw-r--r-- | sci-geosciences/gmt/files/gmt-4.5.9-no-strip.patch | 38 |
2 files changed, 0 insertions, 94 deletions
diff --git a/sci-geosciences/gmt/files/gmt-4.5.6-respect-ldflags.patch b/sci-geosciences/gmt/files/gmt-4.5.6-respect-ldflags.patch deleted file mode 100644 index 07494380fdfb..000000000000 --- a/sci-geosciences/gmt/files/gmt-4.5.6-respect-ldflags.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -urN GMT4.5.6/src/Makefile GMT4.5.6.new/src/Makefile ---- GMT4.5.6/src/Makefile 2011-03-03 22:02:50.000000000 +0100 -+++ GMT4.5.6.new/src/Makefile 2011-06-07 14:48:00.969500019 +0200 -@@ -195,13 +195,13 @@ - $(RANLIB) $@ - - libpsl.$(SL): libpsl.a -- $(LD) $(LD_OPT) pslib.o $(LIBS) -o $@ -+ $(LD) $(LD_OPT) $(LDFLAGS) pslib.o $(LIBS) -o $@ - - libgmt.$(SL): libgmt.a -- $(LD) $(LD_OPT) $(LIB_O) $(TRIANGLE_O) $(ALPHA_SINCOS_O) $(NETCDF_LIB) $(GDAL_LIB) $(LIBS) -o $@ -+ $(LD) $(LD_OPT) $(LDFLAGS) $(LIB_O) $(TRIANGLE_O) $(ALPHA_SINCOS_O) $(NETCDF_LIB) $(GDAL_LIB) $(LIBS) -o $@ - - libgmtps.$(SL): libgmtps.a libgmt.$(SL) libpsl.$(SL) -- $(LD) $(LD_OPT) $(LIBPS_O) libgmt.$(SL) libpsl.$(SL) $(LIBS) -o $@ -+ $(LD) $(LD_OPT) $(LDFLAGS) $(LIBPS_O) libgmt.$(SL) libpsl.$(SL) $(LIBS) -o $@ - - #------------------------------------------------------------------------------- - # program rules -diff -urN GMT4.5.6/src/mgd77/Makefile GMT4.5.6.new/src/mgd77/Makefile ---- GMT4.5.6/src/mgd77/Makefile 2010-11-01 23:39:16.000000000 +0100 -+++ GMT4.5.6.new/src/mgd77/Makefile 2011-06-07 14:53:46.394181616 +0200 -@@ -93,7 +93,7 @@ - $(RANLIB) $@ - - libmgd77.$(SL): libmgd77.a -- $(LD) $(LD_OPT) $(LIB_O) $(GMT_LIB) $(NETCDF_LIB) $(LIBS) -o $@ -+ $(LD) $(LD_OPT) $(LDFLAGS) $(LIB_O) $(GMT_LIB) $(NETCDF_LIB) $(LIBS) -o $@ - - #------------------------------------------------------------------------------- - # program rules -diff -urN GMT4.5.6/src/mgg/Makefile GMT4.5.6.new/src/mgg/Makefile ---- GMT4.5.6/src/mgg/Makefile 2010-11-01 23:39:16.000000000 +0100 -+++ GMT4.5.6.new/src/mgg/Makefile 2011-06-07 14:54:48.096410233 +0200 -@@ -95,7 +95,7 @@ - $(RANLIB) $@ - - libgmt_mgg.$(SL): libgmt_mgg.a -- $(LD) $(LD_OPT) $(LIB_O) $(GMT_LIB) $(NETCDF_LIB) $(LIBS) -o $@ -+ $(LD) $(LD_OPT) $(LDFLAGS) $(LIB_O) $(GMT_LIB) $(NETCDF_LIB) $(LIBS) -o $@ - - #------------------------------------------------------------------------------- - # program rules -diff -urN GMT4.5.6/src/x2sys/Makefile GMT4.5.6.new/src/x2sys/Makefile ---- GMT4.5.6/src/x2sys/Makefile 2010-11-01 23:39:16.000000000 +0100 -+++ GMT4.5.6.new/src/x2sys/Makefile 2011-06-07 14:54:15.124822433 +0200 -@@ -83,7 +83,7 @@ - $(RANLIB) $@ - - libx2sys.$(SL): libx2sys.a -- $(LD) $(LD_OPT) x2sys.o $(ALLLIB) -o $@ -+ $(LD) $(LD_OPT) $(LDFLAGS) x2sys.o $(ALLLIB) -o $@ - - #------------------------------------------------------------------------------- - # program rules diff --git a/sci-geosciences/gmt/files/gmt-4.5.9-no-strip.patch b/sci-geosciences/gmt/files/gmt-4.5.9-no-strip.patch deleted file mode 100644 index f57f1d811b05..000000000000 --- a/sci-geosciences/gmt/files/gmt-4.5.9-no-strip.patch +++ /dev/null @@ -1,38 +0,0 @@ -Drop manipulation of several flags: - -* stripping of -g from CFLAGS, as it interferes with deliberate - generation of debug symbols and breaks on flags like -ggdb. -* Addition of -s resp. -Wl,-x to LDFLAGS, as stipping of binaries is - done as a separate step on Gentoo (and many other distros) in order - to faciliate retention or splitting of debug symbols. -* Setting of optimization flags, as the user should be free to choose - them. - -2009-07-27 Martin von Gagern - -Reference: http://bugs.gentoo.org/279268 - -Index: GMT4.5.0/configure.ac -=================================================================== ---- GMT4.5.0.orig/configure.ac -+++ GMT4.5.0/configure.ac -@@ -527,19 +527,6 @@ if test "X$enable_debug" = "Xyes" ; then - AC_MSG_RESULT(yes) - CFLAGS="$CFLAGS -g" - else -- CFLAGS=`echo $CFLAGS | sed 's/-g//'` -- if test "$os" = "Darwin" ; then -- LDFLAGS="$LDFLAGS -Wl,-x" -- else -- LDFLAGS="$LDFLAGS -s" -- fi -- if test "$GCC" = "yes" || test "$os" = "Linux" || test "$os" = "AIX"; then -- CFLAGS="$CFLAGS -O2" -- elif test "$chip" = "alpha" || test "$os" = "AUX" || test "$os" = "HP-UX"; then -- CFLAGS="$CFLAGS" -- else -- CFLAGS="$CFLAGS -O" -- fi - AC_MSG_RESULT(no) - fi - dnl ----------------------------------------------------------------- |