[csw-devel] SF.net SVN: gar:[16637] csw/mgar/pkg/postgresql/branches/postgresql-8. 4-raos

[guengel at users.sourceforge.net]

Revision: 16637
          http://gar.svn.sourceforge.net/gar/?rev=16637&view=rev
Author:   guengel
Date:     2012-01-01 17:39:18 +0000 (Sun, 01 Jan 2012)
Log Message:
-----------
postgresql/branches/postgresql-8.4-raos: Fixed LDFLAGS output of pg_config. Included libpgport.a which is required when using "pg_config --libs".

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile

Added Paths:
-----------
    csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/0000-Use-plain-rpath.patch

Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile	2012-01-01 12:01:36 UTC (rev 16636)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile	2012-01-01 17:39:18 UTC (rev 16637)
@@ -218,6 +218,9 @@
 # Test running on a NFS may fail. Thus we let the test run in
 # /var/tmp/pgsql/tmp_check
 PATCHFILES += 0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch
+# By default, src/makefiles/Makefile.solaris uses -Wl,-R'$(rpathdir)'
+# which isn't properly digested by Sun's ld
+PATCHFILES += 0000-Use-plain-rpath.patch
 
 INITSMF = $(sysconfdir)/init\.d/$(INITSCRIPTFILE_VERSIONED)
 USERGROUP = $(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED)
@@ -326,6 +329,8 @@
 PKGFILES_CSW$(NAME)-dev += .*/alternatives/$(NAME)_dev.*
 PKGFILES_CSW$(NAME)-dev += .*/CSW$(NAME)-dev.postmsg
 PKGFILES_CSW$(NAME)-dev += .*$(docdir)/$(NAME)_dev/README.CSW
+# See `post-merge-modulated:'
+PKGFILES_CSW$(NAME)-dev += .*/libpgport\.a$
 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibecpg-compat3
 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibecpg6
 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibpq5
@@ -477,6 +482,16 @@
 	$(INSTALL_ENV) gmake -C $(WORKSRC)/contrib DESTDIR=$(DESTDIR) install
 	@$(MAKECOOKIE)
 
+# We suck in the libpgport.a since pg_config is emitting
+# -lpgport. Unfortunately, there is no shared lib version, and I'm too
+# lazzy to adjust the build system to generate one...
+post-merge-modulated:
+ifeq ($(ISA),$(ISA_DEFAULT64))
+	ginstall $(WORKSRC)/src/port/libpgport.a $(PKGROOT)/$(libpath_install)/$(ISA_DEFAULT64)/
+else
+	ginstall $(WORKSRC)/src/port/libpgport.a $(PKGROOT)/$(libdir)/
+endif
+
 post-merge:  $(foreach n,$(POSTMSG),$(PKGROOT)/$(n)) test-installation
 # Create my alternatives files. Development alternatives have stripped
 # off the version

Added: csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/0000-Use-plain-rpath.patch
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/0000-Use-plain-rpath.patch	                        (rev 0)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/0000-Use-plain-rpath.patch	2012-01-01 17:39:18 UTC (rev 16637)
@@ -0,0 +1,25 @@
+From 3e5748b6bc287f4036c2f619c143b9e467b84c29 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafisol at opencsw.org>
+Date: Sun, 1 Jan 2012 17:35:00 +0100
+Subject: [PATCH] Use plain rpath
+
+---
+ src/makefiles/Makefile.solaris |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/makefiles/Makefile.solaris b/src/makefiles/Makefile.solaris
+index bb56830..89d83df 100644
+--- a/src/makefiles/Makefile.solaris
++++ b/src/makefiles/Makefile.solaris
+@@ -6,7 +6,7 @@ ifeq ($(with_gnu_ld), yes)
+ export_dynamic = -Wl,-E
+ rpath = -Wl,-rpath,'$(rpathdir)'
+ else
+-rpath = -Wl,-R'$(rpathdir)'
++rpath = -R$(rpathdir)
+ endif
+ 
+ DLSUFFIX = .so
+-- 
+1.7.6.1
+

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