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

[guengel at users.sourceforge.net]

Revision: 16376
          http://gar.svn.sourceforge.net/gar/?rev=16376&view=rev
Author:   guengel
Date:     2011-12-04 22:58:52 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
postgresql/branches/postgresql-8.3-raos: Added patch for adding SONAME with major and minor version to shared libraries.

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

Added Paths:
-----------
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/0000-SONAME-including-major-and-minor-version.patch

Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile	2011-12-04 20:50:01 UTC (rev 16375)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile	2011-12-04 22:58:52 UTC (rev 16376)
@@ -57,12 +57,30 @@
 #
 # 1. Adjust BASE_VERSION and/or PATCHLEVEL.
 #
-# 2. `mgar merge`
+# 2. Make sure the SONAME patch for
+#    $(WORKDIR)/postgresql-x.y.z/src/Makefile.shlib still works
 #
-# 3. If step 2 succeeded, check the prototype of
+# 3. Comment out 'post-install-modulated:'. So we can identify changes in the
+#    server/client environment.
+#
+# 4. `mgar package`
+#
+# 5. If step 4 succeeded, check the prototype of
 #    CSW$(NAME)$(BASE_VERSION_NODOT) for files that have slipped by and put
 #    them in the proper place.
+#
+# 6. Uncomment 'post-install-modulated:'. This will shed light on changes in
+#    the contrib environment.
+#
+# 7. `mgar spotless package`
+#
+# 8. If step 6 succeeded, check the prototype of
+#    CSW$(NAME)$(BASE_VERSION_NODOT) for files that have slipped by and put
+#    them in the proper place.
+#
+# 9. Make sure the proper version numbers are used for the library packages.
 
+
 # This BUILD is NOT READY!  It needs work before it's usable.
 
 # TODO: Initialize the database cluster during installation if not already
@@ -105,6 +123,13 @@
 DISTFILES += $(USERGROUPFILETMPL)
 DISTFILES += $(CSWPGSQLCONFFILETMPL)
 
+# This patch will make the SONAME of the libraries to contain the major and
+# minor version. This is important when having multiple installations of
+# PostgreSQL where the library versions differ only in the minor part, such as
+# with PostgreSQL 8.3 and PostgreSQL 8.4.
+#
+PATCHFILES += 0000-SONAME-including-major-and-minor-version.patch
+
 INITSMF = $(sysconfdir)/init\.d/$(INITSCRIPTFILE_VERSIONED)
 USERGROUP = $(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED)
 PRESERVECONF = $(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED)

Added: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/0000-SONAME-including-major-and-minor-version.patch
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/0000-SONAME-including-major-and-minor-version.patch	                        (rev 0)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/0000-SONAME-including-major-and-minor-version.patch	2011-12-04 22:58:52 UTC (rev 16376)
@@ -0,0 +1,25 @@
+From 0783c2280989e9175f1bdb91a0035822275eebc4 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafisol at opencsw.org>
+Date: Sun, 4 Dec 2011 23:39:42 +0100
+Subject: [PATCH] SONAME including major and minor version
+
+---
+ src/Makefile.shlib |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/Makefile.shlib b/src/Makefile.shlib
+index 84fc918..15594cf 100644
+--- a/src/Makefile.shlib
++++ b/src/Makefile.shlib
+@@ -93,7 +93,7 @@ shlib_bare	= lib$(NAME)$(DLSUFFIX)
+ 
+ override CFLAGS += $(CFLAGS_SL)
+ 
+-soname = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
++soname = $(shlib)
+ 
+ ifeq ($(PORTNAME), aix)
+   shlib			= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
+-- 
+1.7.6.1
+

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