X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=libs%2Fpostgresql%2FMakefile;h=7ef6aa78a06009301263c63b0143812fcf3c8d43;hp=28a5302cc969eb81c7526fcf5e4c851c8a7cb4ce;hb=21ed62dc1e1e5c7fcd6cec2779c960ade33d61ab;hpb=ffdb9e4ae3d7dbb5d3eba85c07c387bc6231d461

diff --git a/libs/postgresql/Makefile b/libs/postgresql/Makefile
index 28a5302cc9..7ef6aa78a0 100644
--- a/libs/postgresql/Makefile
+++ b/libs/postgresql/Makefile
@@ -1,18 +1,16 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=postgresql
-PKG_VERSION:=8.3.0
+PKG_VERSION:=9.0.0
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=\
 	http://ftp7.us.postgresql.org/pub/postgresql/source/v$(PKG_VERSION) \
@@ -20,18 +18,15 @@ PKG_SOURCE_URL:=\
 	http://ftp9.us.postgresql.org/pub/postgresql/source/v$(PKG_VERSION) \
 	http://ftp.be.postgresql.org/postgresql/source/v$(PKG_VERSION) \
 	ftp://ftp-archives.postgresql.org/pub/source/v$(PKG_VERSION)
-PKG_MD5SUM:=53d6816eac7442f9bc8103439ebee22e
-
-PKG_BUILD_DEPENDS:=libnotimpl
-
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_MD5SUM:=14c2122cc322e69ab2ab702ed7714bbe
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libpq
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+zlib +libreadline +libncurses
+  DEPENDS:=+zlib +libreadline +libncurses +coreutils-su
   TITLE:=PostgreSQL client library
   URL:=http://www.postgresql.org/
   SUBMENU:=database
@@ -102,12 +97,13 @@ define Build/Configure
 			--without-tk \
 			--with-zlib="yes" \
 			--enable-depend \
+			--with-system-timezone=/tmp \
 	);
 	$(MAKE) -C $(PKG_BUILD_DIR)/src/interfaces/ecpg/preproc CC="$(HOSTCC)" CFLAGS+="-I../../libpq"
 	mv $(PKG_BUILD_DIR)/src/interfaces/ecpg/preproc/ecpg \
 		$(PKG_BUILD_DIR)/src/interfaces/ecpg/preproc/ecpg.host
 	$(MAKE) -C $(PKG_BUILD_DIR)/src/timezone CC="$(HOSTCC)"
-	mv $(PKG_BUILD_DIR)/src/timezone/zic $(PKG_BUILD_DIR)/src/timezone/zic.host
+	mv $(PKG_BUILD_DIR)/src/timezone/zic $(STAGING_DIR)/host/bin/zic
 	$(MAKE) -C $(PKG_BUILD_DIR)/src/bin/pg_config CC="$(HOSTCC)"
 	mv $(PKG_BUILD_DIR)/src/bin/pg_config/pg_config \
 		$(PKG_BUILD_DIR)/src/bin/pg_config/pg_config.host
@@ -118,7 +114,6 @@ define Build/Configure
 		CFLAGS="$(TARGET_CFLAGS)" \
 		CPPFLAGS="$$$$CPPFLAGS $(TARGET_CPPFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS)" \
-		LIBS="-lnotimpl" \
 		./configure \
 			--target=$(GNU_TARGET_NAME) \
 			--host=$(GNU_TARGET_NAME) \
@@ -155,17 +150,20 @@ define Build/Configure
 			--without-tk \
 			--with-zlib="yes" \
 			--enable-depend \
+			$(if $(CONFIG_TARGET_avr32),--disable-spinlocks) \
 	);
 	$(SED) 's@ECPG = ../../preproc/ecpg@ECPG = ../../preproc/ecpg.host@' $(PKG_BUILD_DIR)/src/interfaces/ecpg/test/Makefile.regress
-	$(SED) 's@\./zic -d@./zic.host -d@' $(PKG_BUILD_DIR)/src/timezone/Makefile
-	# note: unclear if this is needed yet, commenting out for the moment
-	#$(SED) 's@US/Eastern@America/New_York@' $(PKG_BUILD_DIR)/src/timezone/Makefile
 endef
 
+TARGET_CFLAGS += $(FPIC)
+
 define Build/Compile
-	$(MAKE) -C "$(PKG_BUILD_DIR)" \
+	$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
+		all
+	$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		install
 endef
 
 define Package/libpq/install
@@ -184,98 +182,61 @@ define Package/pgsql-server/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_BIN) \
-		$(PKG_INSTALL_DIR)/usr/bin/postgres \
-		$(PKG_INSTALL_DIR)/usr/bin/dropdb \
-		$(PKG_INSTALL_DIR)/usr/bin/clusterdb \
-		$(PKG_INSTALL_DIR)/usr/bin/createdb \
-		$(PKG_INSTALL_DIR)/usr/bin/createlang \
-		$(PKG_INSTALL_DIR)/usr/bin/createuser \
-		$(PKG_INSTALL_DIR)/usr/bin/droplang \
-		$(PKG_INSTALL_DIR)/usr/bin/dropuser \
-		$(PKG_INSTALL_DIR)/usr/bin/initdb \
-		$(PKG_INSTALL_DIR)/usr/bin/ipcclean \
-		$(PKG_INSTALL_DIR)/usr/bin/pg_config \
-		$(PKG_INSTALL_DIR)/usr/bin/pg_controldata \
-		$(PKG_INSTALL_DIR)/usr/bin/pg_ctl \
-		$(PKG_INSTALL_DIR)/usr/bin/pg_dump \
-		$(PKG_INSTALL_DIR)/usr/bin/pg_dumpall \
-		$(PKG_INSTALL_DIR)/usr/bin/pg_restore \
-		$(PKG_INSTALL_DIR)/usr/bin/pg_resetxlog \
-		$(PKG_INSTALL_DIR)/usr/bin/reindexdb \
-		$(PKG_INSTALL_DIR)/usr/bin/vacuumdb \
-		$(1)/usr/bin
-
-	 ln -s postgres $(1)/usr/bin/postmaster
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
+	ln -sf postgres $(1)/usr/bin/postmaster
 
 	$(INSTALL_BIN) ./files/postgresql.init $(1)/etc/init.d/postgresql
 
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/share/postgresql/postgres.bki \
-		$(PKG_INSTALL_DIR)/usr/share/postgresql/postgres.description \
-		$(PKG_INSTALL_DIR)/usr/share/postgresql/conversion_create.sql \
-		$(PKG_INSTALL_DIR)/usr/share/postgresql/information_schema.sql \
-		$(PKG_INSTALL_DIR)/usr/share/postgresql/pg_hba.conf.sample \
-		$(PKG_INSTALL_DIR)/usr/share/postgresql/pg_ident.conf.sample \
-		$(PKG_INSTALL_DIR)/usr/share/postgresql/pg_service.conf.sample \
-		$(PKG_INSTALL_DIR)/usr/share/postgresql/postgresql.conf.sample \
-		$(PKG_INSTALL_DIR)/usr/share/postgresql/sql_features.txt \
-		$(PKG_INSTALL_DIR)/usr/share/postgresql/postgres.shdescription \
-		$(PKG_INSTALL_DIR)/usr/share/postgresql/psqlrc.sample \
-		$(PKG_INSTALL_DIR)/usr/share/postgresql/recovery.conf.sample \
-		$(PKG_INSTALL_DIR)/usr/share/postgresql/system_views.sql \
+	$(CP) -r $(PKG_INSTALL_DIR)/usr/share/postgresql/* \
 		$(1)/usr/share/postgresql
 
-		$(INSTALL_DATA) ./files/postgresql.config $(1)/etc/config/postgresql
-
-		$(CP) -r \
-			$(PKG_INSTALL_DIR)/usr/share/postgresql/timezone \
-			$(PKG_INSTALL_DIR)/usr/share/postgresql/timezonesets \
-			$(1)/usr/share/postgresql
+	$(INSTALL_DATA) ./files/postgresql.config $(1)/etc/config/postgresql
 
-		$(CP) -r \
-			$(PKG_INSTALL_DIR)/usr/lib/postgresql \
-			$(1)/usr/lib
+	$(CP) -r \
+		$(PKG_INSTALL_DIR)/usr/lib/postgresql \
+		$(1)/usr/lib
 endef
 
 define Package/pgsql-server/postinst
 #!/bin/sh
 grep -q '^postgres:' /etc/passwd && exit 0
-
-if [ -e /bin/addgroup ]; then
-  /bin/addgroup postgres
-  RG=$$?
-
-  if [ -e /bin/adduser ]; then
-    /bin/adduser -h /tmp -H -g 'PostgreSQL administrator' -s /bin/ash -D -H -G postgres postgres
-	RU=$$?
-  fi
-fi
-
-if [ -z "$${RG}" -o -z "$${RU}" ]; then
-  echo "Could not find user utils, you will need to create the postgres user by hand"
-  exit 
+group=$$(grep '^postgres:' /etc/group | cut -f3 -d:)
+if [ -z "$${group}" ] ; then
+	group=1000
+	tst=$$(cat /etc/group | grep ":$${group}:")
+	while [ -n "$${tst}" ] ; do
+		group=$$(($${group}+1))
+		tst=$$(cat /etc/group | grep ":$${group}:")
+	done
+	echo "postgres:x:$${group}:" >>/etc/group
 fi
 
-if [ "$${RG}" != "0" -o "$${RU}" != "0" ]; then
-  echo "Failed to created postgres user"
-  exit 1
+user=$$(cat /etc/passwd | grep "^postgres:")
+if [ -z "$${user}" ] ; then
+	num="$${group}"
+	tst=$$(cat /etc/passwd | grep ":.*:$${num}:")
+	while [ -n "$${tst}" ] ; do
+		num=$$(($${num}+1))
+		tst=$$(cat /etc/passwd | grep ":.*:$${num}:")
+	done
+	echo "postgres:*:$${num}:$${group}:PostgreSQL administrator:/tmp:/bin/ash" >>/etc/passwd
 fi
 endef
 
 define Build/InstallDev
-	mkdir -p $(1)/usr/bin
+	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/bin/pg_config/pg_config.host $(1)/usr/bin/pg_config
-	mkdir -p $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/libpq $(1)/usr/include/
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/libpq-fe.h $(1)/usr/include/
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/pg_config.h $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/pg_config_manual.h $(1)/usr/include/
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/postgres_ext.h $(1)/usr/include/
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/postgresql $(1)/usr/include/
-	mkdir -p $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpq.{a,so*} $(1)/usr/lib/
 	$(CP) $(PKG_BUILD_DIR)/src/interfaces/ecpg/preproc/ecpg.host $(1)/usr/bin/ecpg
-	$(CP) $(PKG_BUILD_DIR)/src/timezone/zic.host $(1)/usr/bin/zic
+	$(CP) $(STAGING_DIR)/host/bin/zic $(1)/usr/bin/zic
 endef
 
 $(eval $(call BuildPackage,libpq))