[csw-devel] SF.net SVN: gar:[19863] csw/mgar/pkg/postgresql/branches/postgresql-8.3

[guengel at users.sourceforge.net]

Revision: 19863
          http://gar.svn.sourceforge.net/gar/?rev=19863&view=rev
Author:   guengel
Date:     2012-12-09 14:06:45 +0000 (Sun, 09 Dec 2012)
Log Message:
-----------
postgresql/branches/postgresql-8.3: New upstream release. Fixed bug 5025 (https://www.opencsw.org/mantis/view.php?id=5025)

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile
    csw/mgar/pkg/postgresql/branches/postgresql-8.3/checksums
    csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/changelog.CSW

Added Paths:
-----------
    csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/0004-Filter-out-compiler-optimization-for-pg_config.patch

Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile	2012-12-09 11:37:45 UTC (rev 19862)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile	2012-12-09 14:06:45 UTC (rev 19863)
@@ -90,7 +90,7 @@
 BASE_VERSION = 8.3
 VERSION_NODOT = $(subst .,_,$(BASE_VERSION))
 BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION))
-PATCHLEVEL = 21
+PATCHLEVEL = 22
 VERSION = $(BASE_VERSION).$(PATCHLEVEL)
 CATEGORIES = apps
 
@@ -225,6 +225,8 @@
 # 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
+# Please see comment in the patch.
+PATCHFILES += 0004-Filter-out-compiler-optimization-for-pg_config.patch
 
 INITSMF = $(sysconfdir)/init\.d/$(INITSCRIPTFILE_VERSIONED)
 USERGROUP = $(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED)

Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3/checksums
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.3/checksums	2012-12-09 11:37:45 UTC (rev 19862)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/checksums	2012-12-09 14:06:45 UTC (rev 19863)
@@ -1 +1 @@
-3ac75d74a1cc7a6c442f1652f73e1d56  postgresql-8.3.21.tar.bz2
+d72e9d6681ff2a18ff19ad587236d098  postgresql-8.3.22.tar.bz2

Added: csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/0004-Filter-out-compiler-optimization-for-pg_config.patch
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/0004-Filter-out-compiler-optimization-for-pg_config.patch	                        (rev 0)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/0004-Filter-out-compiler-optimization-for-pg_config.patch	2012-12-09 14:06:45 UTC (rev 19863)
@@ -0,0 +1,52 @@
+From c361ec294277bfb36aac652bf6f5b6cdd415ba88 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Sun, 9 Dec 2012 12:03:33 +0100
+Subject: [PATCH] Filter out compiler optimization for pg_config
+
+For more information, see comments in this patch and
+https://www.opencsw.org/mantis/view.php?id=5025
+---
+ src/bin/pg_config/Makefile | 19 +++++++++++++++++--
+ 1 file changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile
+index befb8d8..7b73239 100644
+--- a/src/bin/pg_config/Makefile
++++ b/src/bin/pg_config/Makefile
+@@ -8,6 +8,21 @@
+ #
+ #-------------------------------------------------------------------------
+ 
++
++# pg_config has CFLAGS and LDFLAGS hardcoded, including compiler optimization.
++# This doesn't pan out if PostgreSQL is compiled with compiler A, but
++# pg_config is called to compile software with compiler B. So, we filter out
++# known compiler optimization flags (SunStudio and GCC, so far).
++#
++# This var holds all the compiler optimizations that will be filtered out.
++# Please be aware, that this filtering has only been tested with GMAKE.
++#
++# See also
++#  https://www.opencsw.org/mantis/view.php?id=5025
++#
++# --raos
++__compiler_opts = -march=% -mtune=% -xchip=% -xarch=% -xO%
++
+ PGFILEDESC = "pg_config - report configuration information"
+ subdir = src/bin/pg_config
+ top_builddir = ../../..
+@@ -22,9 +37,9 @@ STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/port,$(LDFLAGS))
+ override CPPFLAGS += -DVAL_CONFIGURE="\"$(configure_args)\""
+ override CPPFLAGS += -DVAL_CC="\"$(CC)\""
+ override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\""
+-override CPPFLAGS += -DVAL_CFLAGS="\"$(CFLAGS)\""
++override CPPFLAGS += -DVAL_CFLAGS="\"$(filter-out $(__compiler_opts),$(CFLAGS))\""
+ override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\""
+-override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\""
++override CPPFLAGS += -DVAL_LDFLAGS="\"$(filter-out $(__compiler_opts),$(STD_LDFLAGS))\""
+ override CPPFLAGS += -DVAL_LDFLAGS_SL="\"$(LDFLAGS_SL)\""
+ override CPPFLAGS += -DVAL_LIBS="\"$(LIBS)\""
+ 
+-- 
+1.8.0
+

Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/changelog.CSW	2012-12-09 11:37:45 UTC (rev 19862)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/changelog.CSW	2012-12-09 14:06:45 UTC (rev 19863)
@@ -1,3 +1,13 @@
+postgresql83 (8.3.22,REV=2012.12.09)
+
+  * New upstream release 8.3.22.
+
+  * pg_config: do not emit compiler optimization flags (see
+	       https://www.opencsw.org/mantis/view.php?id=5025)
+
+ -- Rafael Ostertag <raos at opencsw.org>  Sun, 09 Dec 2012 10:02:08 +0100
+
+
 postgresql83 (8.3.21,REV=2012.10.02)
 
   * New upstream release 8.3.21.
@@ -16,7 +26,7 @@
 
   * Dropped support for Solaris 9
 
-  * Include changelog.CSW in all packages, thus removing the clustering of 
+  * Include changelog.CSW in all packages, thus removing the clustering of
     changelog.CSW files in CSWpostgresql
 
  -- Rafael Ostertag <raos at opencsw.org>  Tue, 12 June 2012 16:55:57+0200

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