SF.net SVN: gar:[22313] csw/mgar/pkg/pg-ip4r/branches

guengel at users.sourceforge.net guengel at users.sourceforge.net
Sat Oct 26 16:27:57 CEST 2013


Revision: 22313
          http://gar.svn.sourceforge.net/gar/?rev=22313&view=rev
Author:   guengel
Date:     2013-10-26 14:27:56 +0000 (Sat, 26 Oct 2013)
Log Message:
-----------
pg-ip4r/branches/ip4r-1.05: This branch is only used for postgres 8.3 builds since 8.3 only works with ip4r 1.05. Added BUILD_DEPs.

Modified Paths:
--------------
    csw/mgar/pkg/pg-ip4r/branches/ip4r-1.05/Makefile
    csw/mgar/pkg/pg-ip4r/branches/ip4r-1.05/checksums

Added Paths:
-----------
    csw/mgar/pkg/pg-ip4r/branches/ip4r-1.05/

Modified: csw/mgar/pkg/pg-ip4r/branches/ip4r-1.05/Makefile
===================================================================
--- csw/mgar/pkg/pg-ip4r/trunk/Makefile	2013-10-26 13:34:56 UTC (rev 22311)
+++ csw/mgar/pkg/pg-ip4r/branches/ip4r-1.05/Makefile	2013-10-26 14:27:56 UTC (rev 22313)
@@ -33,30 +33,14 @@
 # Therefore, ip4r-XY has to be downloaded manually and placed in the
 # proper place.
 MASTER_SITES  = http://ftp.postgresql.org/pub/source/v8.3.23/
-MASTER_SITES += http://ftp.postgresql.org/pub/source/v8.4.18/
-MASTER_SITES += http://ftp.postgresql.org/pub/source/v9.0.14/
-MASTER_SITES += http://ftp.postgresql.org/pub/source/v9.1.10/
-MASTER_SITES += http://ftp.postgresql.org/pub/source/v9.2.5/
-MASTER_SITES += http://ftp.postgresql.org/pub/source/v9.3.1/
 DISTFILES  = README.CSW
 DISTFILES += postgresql-8.3.23.tar.gz
-DISTFILES += postgresql-8.4.18.tar.gz
-DISTFILES += postgresql-9.0.14.tar.gz
-DISTFILES += postgresql-9.1.10.tar.gz
-DISTFILES += postgresql-9.2.5.tar.gz
-DISTFILES += postgresql-9.3.1.tar.gz
 # This is only required for Postgres 8.3, since version 2.0 source
 # references to numeric_div_trun() which is not available in 8.3
 DISTFILES += ip4r-1.05.tar.gz
-# This is used for Postgres 8.4-9.0, which do not feature extension
-# packaging mechanism
-DISTFILES += ip4r-2.0.tgz
-# This is used for Postgres 9.1+, which feature extension packaging
-# mechanism
-DISTFILES += ip4r-extension-2.0.tgz
 
 EXTRA_MODULATORS	= PGVERSION
-MODULATIONS_PGVERSION	= 83 84 90 91 92 93
+MODULATIONS_PGVERSION	= 83
 
 # Variables for PGVERSION modulations
 PG_SOURCE_NAME_83		= postgresql-8.3.23
@@ -64,40 +48,28 @@
 IP4R_SOURCE_NAME_83		= ip4r-1.05
 CONFIGURE_ARGS_83		= --with-docdir=$(docdir)/postgresql/$(PGVERSION)
 
-PG_SOURCE_NAME_84		= postgresql-8.4.18
-PG_BASEVERSION_DOT_84		= 8.4
-IP4R_SOURCE_NAME_84		= ip4r-2.0
-CONFIGURE_ARGS_84		= --docdir=$(docdir)/postgresql/$(PGVERSION)
-
-PG_SOURCE_NAME_90		= postgresql-9.0.14
-PG_BASEVERSION_DOT_90		= 9.0
-IP4R_SOURCE_NAME_90		= ip4r-2.0
-CONFIGURE_ARGS_90		= --docdir=$(docdir)/postgresql/$(PGVERSION)
-
-PG_SOURCE_NAME_91		= postgresql-9.1.10
-PG_BASEVERSION_DOT_91		= 9.1
-IP4R_SOURCE_NAME_91		= ip4r-extension-2.0
-CONFIGURE_ARGS_91		= --docdir=$(docdir)/postgresql/$(PGVERSION)
-
-PG_SOURCE_NAME_92		= postgresql-9.2.5
-PG_BASEVERSION_DOT_92		= 9.2
-IP4R_SOURCE_NAME_92		= ip4r-extension-2.0
-CONFIGURE_ARGS_92		= --docdir=$(docdir)/postgresql/$(PGVERSION)
-
-PG_SOURCE_NAME_93		= postgresql-9.3.1
-PG_BASEVERSION_DOT_93		= 9.3
-IP4R_SOURCE_NAME_93		= ip4r-extension-2.0
-CONFIGURE_ARGS_93		= --docdir=$(docdir)/postgresql/$(PGVERSION)
-
 MERGE_SCRIPTS_$(MODULATION)	= copy-relocate
 
 
 PACKAGES  =  $(foreach v,$(MODULATIONS_PGVERSION),CSWpg$(v)-ip4r)
 $(foreach v,$(MODULATIONS_PGVERSION),\
 	$(eval SPKG_DESC_CSWpg$(v)-ip4r = Indexable version of the cidr type for PostgreSQL $(PG_BASEVERSION_DOT_$(v)))\
-	$(eval PKGFILES_CSWpg$(v)-ip4r = .*/postgresql/$(v)/.*)\
+	$(eval PKGFILES_CSWpg$(v)-ip4r  = .*/postgresql/$(v)/.* .*/pg$(v)_ip4r/.*README.CSW)\
 )
 
+BUILD_DEP_PKGS  = CSWlibxml2-dev
+BUILD_DEP_PKGS += CSWlibxslt-dev
+BUILD_DEP_PKGS += CSWperl
+BUILD_DEP_PKGS += CSWpython-dev
+BUILD_DEP_PKGS += CSWlibssl-dev
+BUILD_DEP_PKGS += CSWlibreadline-dev
+BUILD_DEP_PKGS += CSWgsed # gsed is used in this recipe
+BUILD_DEP_PKGS += CSWlibz-dev
+
+# Needed for thread safety check by configure
+LIBS		= -lrt
+EXTRA_CONFIGURE_ENV = LIBS=$(LIBS)
+
 BUILD64 = 1
 
 # We define NO_PGXS=1 so that pg_config is not called. This is the main reason we do it the hard way.
@@ -125,8 +97,6 @@
 
 pre-configure-modulated:
 	cp -R $(WORKDIR)/$(IP4R_SOURCE_NAME_$(PGVERSION)) $(WORKDIR)/$(PG_SOURCE_NAME_$(PGVERSION))/contrib/ip4r
-# Copy errcodes.h into src/include/utils/. Used to make builds for 9.1+ work
-	-cp $(WORKDIR)/$(PG_SOURCE_NAME_$(PGVERSION))/src/backend/utils/errcodes.h $(WORKDIR)/$(PG_SOURCE_NAME_$(PGVERSION))/src/include/utils/
 	@echo " ===> Adjusting pkglibdir in $(WORKDIR)/$(PG_SOURCE_NAME_$(PGVERSION))/src/Makefile.global.in"
 	@if [ -r $(WORKDIR)/$(PG_SOURCE_NAME_$(PGVERSION))/src/Makefile.global.in ] ; then \
 		gsed -i -r -e 's|^(pkglibdir[[:space:]]*=[[:space:]]*)\$$\(libdir\).*$$|\1$$(libdir)/postgresql/$(PGVERSION)|' $(WORKDIR)/$(PG_SOURCE_NAME_$(PGVERSION))/src/Makefile.global.in ; \

Modified: csw/mgar/pkg/pg-ip4r/branches/ip4r-1.05/checksums
===================================================================
--- csw/mgar/pkg/pg-ip4r/trunk/checksums	2013-10-26 13:34:56 UTC (rev 22311)
+++ csw/mgar/pkg/pg-ip4r/branches/ip4r-1.05/checksums	2013-10-26 14:27:56 UTC (rev 22313)
@@ -1,9 +1,2 @@
 be4c4b0fbf91eac6b3bc2330d065f4cd  ip4r-1.05.tar.gz
-d9de4c712a354bfc77d7383d2a04215c  ip4r-2.0.tgz
-a17d5b5314eba314ef9d255cf16e48bd  ip4r-extension-2.0.tgz
 822360229618e4e5965182ac01cc6ca3  postgresql-8.3.23.tar.gz
-2fa850ea2e83e390efceedb60eaf6537  postgresql-8.4.18.tar.gz
-a1a5c6e975e269cff3dac144b9c3ad0e  postgresql-9.0.14.tar.gz
-0bc70c103de99b8f12e9086eb96c44c8  postgresql-9.1.10.tar.gz
-48854ef39a96a22a3aff964817594a28  postgresql-9.2.5.tar.gz
-58edfab25d6bb243ff2c8bf2d2df34d3  postgresql-9.3.1.tar.gz

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



More information about the devel mailing list