X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/f6c83fd28fcb57779662b2b14bf071cfc578057d..3d38ee78058d700f6839e11a59a426cb3ebaec8d:/openwrt/package/postgresql/Makefile

diff --git a/openwrt/package/postgresql/Makefile b/openwrt/package/postgresql/Makefile
index 5a06a9054..1f37bb752 100644
--- a/openwrt/package/postgresql/Makefile
+++ b/openwrt/package/postgresql/Makefile
@@ -2,56 +2,116 @@
 
 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.7
+PKG_RELEASE:=3
+PKG_MD5SUM:=32dac2916d16287d95e0c958a75161fa
 
-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
-
-
-$(DL_DIR)/$(PKG_SOURCE_FILE):
-	mkdir -p $(DL_DIR)
-	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE)
-
-$(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) -
-	$(PATCH) $(PKG_BUILD_DIR) ./patches
-	cp -fpR ./ipkg $(PKG_BUILD_DIR)/
-	chmod a+x $(PKG_BUILD_DIR)/ipkg/rules
-	touch $(PKG_BUILD_DIR)/ipkg/rules
-
-$(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
-
-$(IPKG_STATE_DIR)/info/libpq.list: $(PKG_IPK)
-	$(IPKG) install $(PKG_IPK)
-
-source: $(DL_DIR)/$(PKG_SOURCE_FILE)
-prepare: $(PKG_BUILD_DIR)/ipkg/rules
-compile: $(PKG_IPK)
-install: $(IPKG_STATE_DIR)/info/libpq.list
-
-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)
+	ftp://ftp.tw.postgresql.org/pub/postgresql/source/v$(PKG_VERSION)/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_CAT:=bzcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+include $(TOPDIR)/package/rules.mk
+
+$(eval $(call PKG_template,LIBPQ,libpq,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,PGSQL_CLI,pgsql-cli,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+
+$(PKG_BUILD_DIR)/.configured:
+#	./configure advertise "--infodir", but does not support it, replaced with "--docdir"
+	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS) $(EXTRA_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)/.built:
+	$(MAKE) -C "$(PKG_BUILD_DIR)/src/include" \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		all install
+	$(MAKE) -C "$(PKG_BUILD_DIR)/src/interfaces/libpq" \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		all install
+	$(MAKE) -C "$(PKG_BUILD_DIR)/src/bin/psql" \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		all install
+	touch $@
+
+$(IPKG_LIBPQ):
+	install -d -m0755 $(IDIR_LIBPQ)/usr/lib
+	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpq.so.* $(IDIR_LIBPQ)/usr/lib/
+	$(RSTRIP) $(IDIR_LIBPQ)
+	$(IPKG_BUILD) $(IDIR_LIBPQ) $(PACKAGE_DIR)
+
+$(IPKG_PGSQL_CLI):
+	install -d -m0755 $(IDIR_PGSQL_CLI)/usr/bin
+	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/psql $(IDIR_PGSQL_CLI)/usr/bin/
+	$(RSTRIP) $(IDIR_PGSQL_CLI)
+	$(IPKG_BUILD) $(IDIR_PGSQL_CLI) $(PACKAGE_DIR)
+
+$(STAGING_DIR)/usr/lib/libpq.so: $(PKG_BUILD_DIR)/.built
+	mkdir -p $(STAGING_DIR)/usr/include
+	cp -fpR $(PKG_INSTALL_DIR)/usr/include/libpq $(STAGING_DIR)/usr/include/
+	cp -fpR $(PKG_INSTALL_DIR)/usr/include/libpq-fe.h $(STAGING_DIR)/usr/include/
+	cp -fpR $(PKG_INSTALL_DIR)/usr/include/postgres_ext.h $(STAGING_DIR)/usr/include/
+	cp -fpR $(PKG_INSTALL_DIR)/usr/include/postgresql $(STAGING_DIR)/usr/include/
+	mkdir -p $(STAGING_DIR)/usr/lib
+	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpq.{a,so*} $(STAGING_DIR)/usr/lib/
+	touch $@
+
+install-dev: $(STAGING_DIR)/usr/lib/libpq.so
+
+uninstall-dev:
+	rm -rf \
+		$(STAGING_DIR)/usr/include/libpq \
+		$(STAGING_DIR)/usr/include/libpq-fe.h \
+		$(STAGING_DIR)/usr/include/postgres_ext.h \
+		$(STAGING_DIR)/usr/include/postgresql \
+		$(STAGING_DIR)/usr/lib/libpq.{a,so*} \
+
+compile: install-dev
+clean: uninstall-dev