[csw-devel] SF.net SVN: gar:[12545] csw/mgar/pkg/gmt/trunk

[gadavis at users.sourceforge.net]

Revision: 12545
          http://gar.svn.sourceforge.net/gar/?rev=12545&view=rev
Author:   gadavis
Date:     2011-01-14 21:32:22 +0000 (Fri, 14 Jan 2011)

Log Message:
-----------
(gmt) renable shared objects

Re-enable shared-object compilation since the statically linked package was
huge.

Attempt to fix upstream bugs with creating shared objects when libm and 
libsunmath are in use

Modified Paths:
--------------
    csw/mgar/pkg/gmt/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/gmt/trunk/files/0001-Add-LDFLAGS-to-shared-object-linking-commands.patch

Modified: csw/mgar/pkg/gmt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gmt/trunk/Makefile	2011-01-14 17:48:24 UTC (rev 12544)
+++ csw/mgar/pkg/gmt/trunk/Makefile	2011-01-14 21:32:22 UTC (rev 12545)
@@ -23,6 +23,7 @@
 DISTFILES += GMT$(GMT_VERSION)_suppl.tar.bz2
 UFILES_REGEX = GMT(\d+(?:\.\d+)*)_(.*).tar.gz
 
+PATCHFILES += 0001-Add-LDFLAGS-to-shared-object-linking-commands.patch
 
 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWnetcdf-devel CSWnetcdf
 
@@ -55,7 +56,7 @@
 CONFIGURE_ARGS += CXXFLAGS="$(CXXFLAGS)"
 CONFIGURE_ARGS += $(DIRPATHS)
 CONFIGURE_ARGS += --disable-mex
-#CONFIGURE_ARGS += --enable-shared
+CONFIGURE_ARGS += --enable-shared
 CONFIGURE_ARGS += --enable-netcdf=/opt/csw
 
 

Added: csw/mgar/pkg/gmt/trunk/files/0001-Add-LDFLAGS-to-shared-object-linking-commands.patch
===================================================================
--- csw/mgar/pkg/gmt/trunk/files/0001-Add-LDFLAGS-to-shared-object-linking-commands.patch	                        (rev 0)
+++ csw/mgar/pkg/gmt/trunk/files/0001-Add-LDFLAGS-to-shared-object-linking-commands.patch	2011-01-14 21:32:22 UTC (rev 12545)
@@ -0,0 +1,47 @@
+From c9367a8a9f1356e77a81d16cbb2586ffd904ca7e Mon Sep 17 00:00:00 2001
+From: Geoff Davis <gadavis at opencsw.org>
+Date: Fri, 14 Jan 2011 22:27:41 +0100
+Subject: [PATCH] Add LDFLAGS to shared object linking commands
+
+---
+ src/Makefile       |    6 +++---
+ src/x2sys/Makefile |    2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 128b4fb..422df20 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -195,13 +195,13 @@ libgmtps.a:	$(LIBPS_O)
+ 		$(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 --git a/src/x2sys/Makefile b/src/x2sys/Makefile
+index 23732ef..2ccf224 100644
+--- a/src/x2sys/Makefile
++++ b/src/x2sys/Makefile
+@@ -83,7 +83,7 @@ libx2sys.a:	$(LIB_O)
+ 		$(RANLIB) $@
+ 
+ libx2sys.$(SL):	libx2sys.a
+-		$(LD) $(LD_OPT) x2sys.o $(ALLLIB) -o $@
++		$(LD) $(LD_OPT) $(LDFLAGS) x2sys.o $(ALLLIB) -o $@
+ 
+ #-------------------------------------------------------------------------------
+ #	program rules
+-- 
+1.7.3.2
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.