Revision: 23400
http://sourceforge.net/p/gar/code/23400
Author: guengel
Date: 2014-04-12 18:36:59 +0000 (Sat, 12 Apr 2014)
Log Message:
-----------
postgresql/trunk: New upstream release. 32/64bit specific header wrapped.
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/ecpg_config.h
csw/mgar/pkg/postgresql/trunk/files/pg_config.h
csw/mgar/pkg/postgresql/trunk/files/pg_config_ext.h
Modified: csw/mgar/pkg/postgresql/trunk/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/trunk/Makefile 2014-04-12 09:04:51 UTC (rev
23399)
+++ csw/mgar/pkg/postgresql/trunk/Makefile 2014-04-12 18:36:59 UTC (rev
23400)
@@ -85,12 +85,24 @@
# Further, it does not use alternatives and puts binaries in $(bindir)
# (see 'post-merge-modulated:'). This will make it easier for
# maintainers to use `pg_config'.
+#
+# The following headers are architecture dependend:
+#
+# $(includedir)/pg_config.h
+# $(includedir)/pg_config_ext.h
+# $(includedir)/ecpg_config.h
+# $(includedir)/postgresql/server/pg_config.h
+# $(includedir)/postgresql/server/pg_config_ext.h
+#
+# therefore, they will be renamed to _32.h, or _64.h repectively, and
+# a wrapper header file will be placed which includes the proper
+# header file upon compile time.
NAME = postgresql
BASE_VERSION = 9.3
VERSION_NODOT = $(subst .,_,$(BASE_VERSION))
BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION))
-PATCHLEVEL = 3
+PATCHLEVEL = 4
VERSION = $(BASE_VERSION).$(PATCHLEVEL)
GARTYPE = v2
GARCOMPILER = SOS12U3
@@ -262,6 +274,9 @@
DISTFILES = $(NAME)-$(VERSION).tar.bz2
DISTFILES += README.CSW
DISTFILES += changelog.CSW
+DISTFILES += pg_config.h
+DISTFILES += pg_config_ext.h
+DISTFILES += ecpg_config.h
DISTFILES += $(SERVERPOSTINSTTMPL)
DISTFILES += $(INITSCRIPTFILETMPL)
DISTFILES += $(USERGROUPFILETMPL)
@@ -577,6 +592,13 @@
@echo " ===> Installing contrib stuff"
$(INSTALL_ENV) gmake -C $(WORKSRC)/contrib DESTDIR=$(DESTDIR) install
$(INSTALL_ENV) gmake -C $(WORKSRC) DESTDIR=$(DESTDIR) install-docs
+# Move headers depending on the memory model aside.
+# In post-merge, a wrapper header file will be dropped in their place
including the proper header dynamically.
+ gmv $(DESTDIR)$(includedir)/pg_config.h
$(DESTDIR)$(includedir)/pg_config_$(MEMORYMODEL).h
+ gmv $(DESTDIR)$(includedir)/pg_config_ext.h
$(DESTDIR)$(includedir)/pg_config_ext_$(MEMORYMODEL).h
+ gmv $(DESTDIR)$(includedir)/ecpg_config.h
$(DESTDIR)$(includedir)/ecpg_config_$(MEMORYMODEL).h
+ gmv $(DESTDIR)$(includedir)/postgresql/server/pg_config.h
$(DESTDIR)$(includedir)/postgresql/server/pg_config_$(MEMORYMODEL).h
+ gmv $(DESTDIR)$(includedir)/postgresql/server/pg_config_ext.h
$(DESTDIR)$(includedir)/postgresql/server/pg_config_ext_$(MEMORYMODEL).h
@$(MAKECOOKIE)
# We suck in the libpgport.a since pg_config is emitting
@@ -593,6 +615,13 @@
for f in $(BIN_NAMES_DEVEL) ; do \
gmv -v
$(PKGROOT)$(libexecdir)/$(NAME)/$(BASE_VERSION_NODOT)/$$f $(PKGROOT)$(bindir)/
; \
done
+# here, we pull in the header architecture dependend header files
+ gmv $(DESTDIR)$(includedir)/pg_config_$(MEMORYMODEL).h
$(PKGROOT)$(includedir)/pg_config_$(MEMORYMODEL).h
+ gmv $(DESTDIR)$(includedir)/pg_config_ext_$(MEMORYMODEL).h
$(PKGROOT)$(includedir)/pg_config_ext_$(MEMORYMODEL).h
+ gmv $(DESTDIR)$(includedir)/ecpg_config_$(MEMORYMODEL).h
$(PKGROOT)$(includedir)/ecpg_config_$(MEMORYMODEL).h
+ gmv
$(DESTDIR)$(includedir)/postgresql/server/pg_config_$(MEMORYMODEL).h
$(PKGROOT)$(includedir)/postgresql/server/pg_config_$(MEMORYMODEL).h
+ gmv
$(DESTDIR)$(includedir)/postgresql/server/pg_config_ext_$(MEMORYMODEL).h
$(PKGROOT)$(includedir)/postgresql/server/pg_config_ext_$(MEMORYMODEL).h
+ @$(MAKECOOKIE)
post-merge: $(foreach n,$(POSTMSG),$(PKGROOT)/$(n)) test-installation
# Create my alternatives files.
@@ -600,6 +629,17 @@
# Create the PGDATA directory
@echo " ===> Create pgdata directory"
@ginstall -d $(PKGROOT)$(PGDATA)
+# Install the omnipotent pg_config.h
+ @echo " ===> Install omnipotent pg_config.h"
+ @ginstall $(FILEDIR)/pg_config.h $(PKGROOT)$(includedir)
+ @echo " ===> Install omnipotent pg_config_ext.h"
+ @ginstall $(FILEDIR)/pg_config_ext.h $(PKGROOT)$(includedir)
+ @echo " ===> Install omnipotent postgresql/server/pg_config.h"
+ @ginstall $(FILEDIR)/pg_config.h
$(PKGROOT)$(includedir)/postgresql/server
+ @echo " ===> Install omnipotent postgresql/server/pg_config_ext.h"
+ @ginstall $(FILEDIR)/pg_config_ext.h
$(PKGROOT)$(includedir)/postgresql/server
+ @echo " ===> Install omnipotent ecpg_config.h"
+ @ginstall $(FILEDIR)/ecpg_config.h $(PKGROOT)$(includedir)
# Adjust the man page names.
@echo " ===> Adjusting man page file names"
@for i in 1 5 ; do \
Modified: csw/mgar/pkg/postgresql/trunk/checksums
===================================================================
--- csw/mgar/pkg/postgresql/trunk/checksums 2014-04-12 09:04:51 UTC (rev
23399)
+++ csw/mgar/pkg/postgresql/trunk/checksums 2014-04-12 18:36:59 UTC (rev
23400)
@@ -1 +1 @@
-0247b0a24e76a3f20cc50c06d0aa2412 postgresql-9.3.3.tar.bz2
+d0a41f54c377b2d2fab4a003b0dac762 postgresql-9.3.4.tar.bz2
Modified: csw/mgar/pkg/postgresql/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/postgresql/trunk/files/changelog.CSW 2014-04-12 09:04:51 UTC
(rev 23399)
+++ csw/mgar/pkg/postgresql/trunk/files/changelog.CSW 2014-04-12 18:36:59 UTC
(rev 23400)
@@ -1,3 +1,15 @@
+postgresql93 (9.3.4,REV=2014.04.12)
+
+ * New upstream release 9.3.4.
+
+ * /opt/csw/include/pg_config.h, /opt/csw/include/pg_config_ext.h,
+ /opt/csw/include/ecpg_config.h,
/opt/csw/include/postgresql/server/pg_config.h,
+ /opt/csw/include/postgresql/server/pg_config_ext.h: are moved to
<filename>_32.h,
+ and <filename>_64.h respectively, and a wrapper <filename>.h is put in
place.
+
+ -- Rafael Ostertag <r...@opencsw.org> Sat, 12 Apr 2014 20:28:05 +0200
+
+
postgresql93 (9.3.3,REV=2014.03.16)
* New upstream release 9.3.3.
@@ -14,7 +26,7 @@
postgresql93 (9.3.1,REV=2013.10.22)
- * New upstream release 9.3.1.
+ * New upstream release 9.3.1.
-- Rafael Ostertag <r...@opencsw.org> Tue, 22 Oct 2013 19:16:40 +0200
@@ -28,4 +40,3 @@
* /etc/opt/csw/postgresql-93.conf has new configuration option
`DATACHECKSUMS'.
-- Rafael Ostertag <r...@opencsw.org> Sun, 06 Oct 2013 11:54:20 +0200
-
Added: csw/mgar/pkg/postgresql/trunk/files/ecpg_config.h
===================================================================
--- csw/mgar/pkg/postgresql/trunk/files/ecpg_config.h
(rev 0)
+++ csw/mgar/pkg/postgresql/trunk/files/ecpg_config.h 2014-04-12 18:36:59 UTC
(rev 23400)
@@ -0,0 +1,20 @@
+/*
+ * ecpg_config.h for 32bit is distinct from ecpg_config.h for 64bit
+ * architectures. In order to take this into account, this wrapper
+ * includes the proper ecpg_config.h depending on the architecture.
+ *
+ * This header is not part of the regular postgresql headers. It has
+ * been introduced due to the way things are handled in OpenCSW
+ * Postgresql.
+ *
+ * It is required that this header works with Sun Studio compilers as
+ * well as GNU GCC compilers.
+ *
+ * $Id$
+ */
+
+#if defined(__amd64) || defined(__sparcv9)
+# include <ecpg_config_64.h>
+#else
+# include <ecpg_config_32.h>
+#endif
Property changes on: csw/mgar/pkg/postgresql/trunk/files/ecpg_config.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: csw/mgar/pkg/postgresql/trunk/files/pg_config.h
===================================================================
--- csw/mgar/pkg/postgresql/trunk/files/pg_config.h
(rev 0)
+++ csw/mgar/pkg/postgresql/trunk/files/pg_config.h 2014-04-12 18:36:59 UTC
(rev 23400)
@@ -0,0 +1,20 @@
+/*
+ * pg_config.h for 32bit is distinct from pg_config.h for 64bit
+ * architectures. In order to take this into account, this wrapper
+ * includes the proper pg_config.h depending on the architecture.
+ *
+ * This header is not part of the regular postgresql headers. It has
+ * been introduced due to the way things are handled in OpenCSW
+ * Postgresql.
+ *
+ * It is required that this header works with Sun Studio compilers as
+ * well as GNU GCC compilers.
+ *
+ * $Id$
+ */
+
+#if defined(__amd64) || defined(__sparcv9)
+# include <pg_config_64.h>
+#else
+# include <pg_config_32.h>
+#endif
Property changes on: csw/mgar/pkg/postgresql/trunk/files/pg_config.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: csw/mgar/pkg/postgresql/trunk/files/pg_config_ext.h
===================================================================
--- csw/mgar/pkg/postgresql/trunk/files/pg_config_ext.h
(rev 0)
+++ csw/mgar/pkg/postgresql/trunk/files/pg_config_ext.h 2014-04-12 18:36:59 UTC
(rev 23400)
@@ -0,0 +1,20 @@
+/*
+ * pg_config_ext.h for 32bit is distinct from pg_config_ext.h for 64bit
+ * architectures. In order to take this into account, this wrapper
+ * includes the proper pg_config_ext.h depending on the architecture.
+ *
+ * This header is not part of the regular postgresql headers. It has
+ * been introduced due to the way things are handled in OpenCSW
+ * Postgresql.
+ *
+ * It is required that this header works with Sun Studio compilers as
+ * well as GNU GCC compilers.
+ *
+ * $Id$
+ */
+
+#if defined(__amd64) || defined(__sparcv9)
+# include <pg_config_ext_64.h>
+#else
+# include <pg_config_ext_32.h>
+#endif
Property changes on: csw/mgar/pkg/postgresql/trunk/files/pg_config_ext.h
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
