[csw-devel] SF.net SVN: gar:[19867] csw/mgar/pkg/postgresql/trunk

[guengel at users.sourceforge.net]

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

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

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

Modified: csw/mgar/pkg/postgresql/trunk/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/trunk/Makefile	2012-12-09 14:08:37 UTC (rev 19866)
+++ csw/mgar/pkg/postgresql/trunk/Makefile	2012-12-09 14:10:05 UTC (rev 19867)
@@ -90,7 +90,7 @@
 BASE_VERSION = 9.2
 VERSION_NODOT = $(subst .,_,$(BASE_VERSION))
 BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION))
-PATCHLEVEL = 1
+PATCHLEVEL = 2
 VERSION = $(BASE_VERSION).$(PATCHLEVEL)
 GARTYPE = v2
 
@@ -280,6 +280,8 @@
 # By default, src/makefiles/Makefile.solaris uses -Wl,-R'$(rpathdir)'
 # which isn't properly digested by Sun's ld
 PATCHFILES += 0002-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/trunk/checksums
===================================================================
--- csw/mgar/pkg/postgresql/trunk/checksums	2012-12-09 14:08:37 UTC (rev 19866)
+++ csw/mgar/pkg/postgresql/trunk/checksums	2012-12-09 14:10:05 UTC (rev 19867)
@@ -1 +1 @@
-c0b4799ea9850eae3ead14f0a60e9418  postgresql-9.2.1.tar.bz2
+1cc388988e69bf75c6b55d59070100f6  postgresql-9.2.2.tar.bz2

Added: csw/mgar/pkg/postgresql/trunk/files/0004-Filter-out-compiler-optimization-for-pg_config.patch
===================================================================
--- csw/mgar/pkg/postgresql/trunk/files/0004-Filter-out-compiler-optimization-for-pg_config.patch	                        (rev 0)
+++ csw/mgar/pkg/postgresql/trunk/files/0004-Filter-out-compiler-optimization-for-pg_config.patch	2012-12-09 14:10:05 UTC (rev 19867)
@@ -0,0 +1,49 @@
+From 59e93fbc61cbd54fe79db5abf061c27e8e83bf09 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Sun, 9 Dec 2012 14:14:02 +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 | 16 ++++++++++++++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile
+index e9aa0a7..8a0c895 100644
+--- a/src/bin/pg_config/Makefile
++++ b/src/bin/pg_config/Makefile
+@@ -8,6 +8,18 @@
+ #
+ #-------------------------------------------------------------------------
+ 
++# 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
++__compiler_opts = -march=% -mtune=% -xchip=% -xarch=% -xO%
++
+ PGFILEDESC = "pg_config - report configuration information"
+ PGAPPICON=win32
+ 
+@@ -24,9 +36,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_EX="\"$(LDFLAGS_EX)\""
+ override CPPFLAGS += -DVAL_LDFLAGS_SL="\"$(LDFLAGS_SL)\""
+ override CPPFLAGS += -DVAL_LIBS="\"$(LIBS)\""
+-- 
+1.8.0
+

Modified: csw/mgar/pkg/postgresql/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/postgresql/trunk/files/changelog.CSW	2012-12-09 14:08:37 UTC (rev 19866)
+++ csw/mgar/pkg/postgresql/trunk/files/changelog.CSW	2012-12-09 14:10:05 UTC (rev 19867)
@@ -1,3 +1,13 @@
+postgresql92 (9.2.2,REV=2012.12.09)
+
+  * New upstream release 9.2.2.
+
+  * 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
+
+
 postgresql92 (9.2.1,REV=2012.10.03)
 
   * New upstream release 9.2.1

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