X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/bdf756b87aae8a2ce87f3b87baae76ea3a8ed52a..2c900460292c518c4f5184e9b23ca43f5782ef5d:/openwrt/package/postgresql/Makefile diff --git a/openwrt/package/postgresql/Makefile b/openwrt/package/postgresql/Makefile index 59be6f06b..5f269b1b9 100644 --- a/openwrt/package/postgresql/Makefile +++ b/openwrt/package/postgresql/Makefile @@ -3,16 +3,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=postgresql -PKG_VERSION:=7.4.7 -PKG_RELEASE:=3 -PKG_MD5SUM:=32dac2916d16287d95e0c958a75161fa +PKG_VERSION:=7.4.9 +PKG_RELEASE:=1 +PKG_MD5SUM:=d7cf0f0a0e1dda19268f55cb1e124c77 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)/ + ftp://ftp.tw.postgresql.org/pub/postgresql/source/v$(PKG_VERSION)/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_CAT:=bzcat @@ -22,9 +21,10 @@ 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" +$(PKG_BUILD_DIR)/.configured: (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ @@ -76,31 +76,52 @@ $(PKG_BUILD_DIR)/.built: $(MAKE) -C "$(PKG_BUILD_DIR)/src/interfaces/libpq" \ DESTDIR="$(PKG_INSTALL_DIR)" \ all install + $(MAKE) -C "$(PKG_BUILD_DIR)/src/bin/pg_config" \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + includedir="$(STAGING_DIR)/usr/include" \ + libdir="$(STAGING_DIR)/usr/lib" \ + all install + $(MAKE) -C "$(PKG_BUILD_DIR)/src/bin/psql" \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install touch $@ -$(IPKG_LIBPQ): $(STAGING_DIR)/usr/lib/libpq.so +$(IPKG_LIBPQ): install -d -m0755 $(IDIR_LIBPQ)/usr/lib - cp -fpR $(STAGING_DIR)/usr/lib/libpq.so.* $(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/bin + cp -fpR $(PKG_INSTALL_DIR)/usr/bin/pg_config $(STAGING_DIR)/usr/bin/ 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/pg_config.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 $(STAGING_DIR)/usr/lib/libpq.so + touch $@ install-dev: $(STAGING_DIR)/usr/lib/libpq.so uninstall-dev: rm -rf \ - $(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*} \ + $(STAGING_DIR)/usr/bin/pg_config \ + $(STAGING_DIR)/usr/include/libpq \ + $(STAGING_DIR)/usr/include/libpq-fe.h \ + $(STAGING_DIR)/usr/include/pg_config.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 +compile-targets: install-dev +clean-targets: uninstall-dev