Change postgresql to experimental coding style Make configure honor CPPFLAGS

SVN-Revision: 638

3 files changed, 107 insertions, 39 deletions

diff --git a/openwrt/package/postgresql/Makefile b/openwrt/package/postgresql/Makefile
index 15ef2570d6..6ed5b1634f 100644
--- a/openwrt/package/postgresql/Makefile
+++ b/openwrt/package/postgresql/Makefile
@@ -2,57 +2,107 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME := postgresql
-PKG_VERSION := 7.4.6
-PKG_RELEASE := 3
-PKG_MD5SUM := f0ea2b372a7bdaf2613e92176ebf5e0f
+PKG_NAME:=postgresql
+PKG_VERSION:=7.4.6
+PKG_RELEASE:=3
+PKG_MD5SUM:=f0ea2b372a7bdaf2613e92176ebf5e0f
 
-PKG_SOURCE_SITE := \
+PKG_SOURCE_URL:=\
 	ftp://ftp3.us.postgresql.org/pub/postgresql/source/v$(PKG_VERSION)/ \
 	ftp://ftp.br.postgresql.org/pub/PostgreSQL/source/v$(PKG_VERSION)/ \
 	ftp://ftp.au.postgresql.org/pub/postgresql/source/v$(PKG_VERSION)/ \
 	ftp://ftp.tw.postgresql.org/pub/postgresql/source/v$(PKG_VERSION)/ \
 	http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/
-PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_CAT := bzcat
-PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR)
-PKG_IPK := $(PACKAGE_DIR)/libpq_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_CAT:=bzcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
-$(DL_DIR)/$(PKG_SOURCE_FILE):
-	mkdir -p $(DL_DIR)
-	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE)
+IPKG_LIBPQ:=$(PACKAGE_DIR)/libpq_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+IDIR_LIBPQ:=$(PKG_BUILD_DIR)/ipkg
+INFO_LIBPQ:=$(IPKG_STATE_DIR)/info/libpq.list
 
-$(PKG_BUILD_DIR)/ipkg/rules: $(DL_DIR)/$(PKG_SOURCE_FILE)
-	mkdir -p $(TOOL_BUILD_DIR)
-	rm -rf $(PKG_BUILD_DIR)
-	$(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+$(DL_DIR)/$(PKG_SOURCE):
+	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
+
+$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
+	$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	$(PATCH) $(PKG_BUILD_DIR) ./patches
-	cp -fpR ./ipkg $(PKG_BUILD_DIR)/
-	find $(PKG_BUILD_DIR) -name CVS | xargs rm -rf
-	chmod a+x $(PKG_BUILD_DIR)/ipkg/rules
-	touch $(PKG_BUILD_DIR)/ipkg/rules
+	touch $(PKG_BUILD_DIR)/.prepared
 
-$(PKG_IPK): $(PKG_BUILD_DIR)/ipkg/rules
-	cd $(PKG_BUILD_DIR); \
-	TOPDIR="$(TOPDIR)" IPKG_RULES_INC="$(TOPDIR)/rules.mk" \
-	INSTALL_DIR="$(STAGING_DIR)" \
-	./ipkg/rules package
+$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+#	./configure advertise "--infodir", but does not support it, replaced with "--docdir"
+	(cd $(PKG_BUILD_DIR); rm -rf config.cache config.status; \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		CPPFLAGS="$$CPPFLAGS -I$(STAGING_DIR)/usr/include" \
+		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+		./configure \
+		--target=$(GNU_TARGET_NAME) \
+		--host=$(GNU_TARGET_NAME) \
+		--build=$(GNU_HOST_NAME) \
+		--program-prefix="" \
+		--program-suffix="" \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--datadir=/usr/share \
+		--includedir=/usr/include \
+		--docdir=/usr/share/info \
+		--libdir=/usr/lib \
+		--libexecdir=/usr/lib \
+		--localstatedir=/var \
+		--mandir=/usr/share/man \
+		--sbindir=/usr/sbin \
+		--sysconfdir=/etc \
+		$(DISABLE_NLS) \
+		$(DISABLE_LARGEFILE) \
+		--enable-shared \
+		--enable-static \
+		--disable-integer-datetimes \
+		--disable-rpath \
+		--without-java \
+		--without-krb4 \
+		--without-krb5 \
+		--without-openssl \
+		--without-pam \
+		--without-perl \
+		--without-python \
+		--without-readline \
+		--without-rendezvous \
+		--without-tcl \
+		--without-tk \
+		--with-zlib="yes" \
+	);
+	touch $(PKG_BUILD_DIR)/.configured
 
-$(IPKG_STATE_DIR)/info/libpq.list: $(PKG_IPK)
-	$(IPKG) install $(PKG_IPK)
+$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+	$(MAKE) -C "$(PKG_BUILD_DIR)" \
+		$(TARGET_CONFIGURE_OPTS)
+	touch $(PKG_BUILD_DIR)/.built
 
-source: $(DL_DIR)/$(PKG_SOURCE_FILE)
-prepare: $(PKG_BUILD_DIR)/ipkg/rules
-compile: $(PKG_IPK)
-install: $(IPKG_STATE_DIR)/info/libpq.list
+$(STAGING_DIR)/usr/lib/libpq.so: $(PKG_BUILD_DIR)/.built
+	$(MAKE) -C "$(PKG_BUILD_DIR)" \
+		DESTDIR="$(STAGING_DIR)" \
+		install
 
-clean:
-	-cd $(PKG_BUILD_DIR); \
-	TOPDIR="$(TOPDIR)" IPKG_RULES_INC="$(TOPDIR)/rules.mk" \
-	INSTALL_DIR="$(STAGING_DIR)" \
-	./ipkg/rules clean
-	rm -rf $(PKG_BUILD_DIR)
-	rm -f $(PKG_IPK)
+$(IPKG_LIBPQ): $(STAGING_DIR)/usr/lib/libpq.so
+	$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBPQ) libpq.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+	mkdir -p $(IDIR_LIBPQ)/usr/lib
+	cp -fp $(STAGING_DIR)/usr/lib/libpq.so.* $(IDIR_LIBPQ)/usr/lib/
+	$(STRIP) $(IDIR_LIBPQ)/usr/lib/*.so*
+	mkdir -p $(PACKAGE_DIR)
+	$(IPKG_BUILD) $(IDIR_LIBPQ) $(PACKAGE_DIR)
+
+$(INFO_LIBPQ): $(IPKG_LIBPQ)
+	$(IPKG) install $(IPKG_LIBPQ)
 
+prepare: $(PKG_BUILDPKG_SOURCE_DIR)/.prepared
+compile: $(IPKG_LIBPQ)
+install: $(INFO_LIBPQ)
+
+clean:
+	-$(MAKE) -C "$(PKG_BUILD_DIR)" \
+		DESTDIR="$(STAGING_DIR)" \
+		uninstall
+	rm -rf $(PKG_BUILD_DIR) $(IPKG_LIBPQ)
diff --git a/openwrt/package/postgresql/libpq.control b/openwrt/package/postgresql/libpq.control
new file mode 100644
index 0000000000..56bdf2e728
--- /dev/null
+++ b/openwrt/package/postgresql/libpq.control
@@ -0,0 +1,8 @@
+Package: libpq
+Priority: optional
+Section: libs
+Version: [TBDL]
+Architecture: [TBDL]
+Maintainer: Nico <nthill@free.fr>
+Source: http://nthill.free.fr/openwrt/sources/postgresql/
+Description: PostgreSQL client library
diff --git a/openwrt/package/postgresql/patches/750-configure-honor-cppflags.patch b/openwrt/package/postgresql/patches/750-configure-honor-cppflags.patch
new file mode 100644
index 0000000000..897c6c05a9
--- /dev/null
+++ b/openwrt/package/postgresql/patches/750-configure-honor-cppflags.patch
@@ -0,0 +1,10 @@
+diff -ruN postgresql-7.4.6-old/src/template/linux postgresql-7.4.6-new/src/template/linux
+--- postgresql-7.4.6-old/src/template/linux	2003-10-09 18:52:45.000000000 +0200
++++ postgresql-7.4.6-new/src/template/linux	2005-04-13 03:12:49.000000000 +0200
+@@ -1,5 +1,5 @@
+ # Force _GNU_SOURCE on; plperl is broken with Perl 5.8.0 otherwise
+-CPPFLAGS="-D_GNU_SOURCE"
++CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+ 
+ THREAD_SUPPORT=yes
+ NEED_REENTRANT_FUNCS=yes	# Debian kernel 2.2 2003-09-27