Simplify configure and add target optimizations,

[openwrt.git] / openwrt / package / postgresql / Makefile

diff --git a/openwrt/package/postgresql/Makefile b/openwrt/package/postgresql/Makefile
index 6ed5b16..1f37bb7 100644 (file)
--- a/openwrt/package/postgresql/Makefile
+++ b/openwrt/package/postgresql/Makefile
@@ -3,38 +3,31 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=postgresql
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=postgresql

-PKG_VERSION:=7.4.6
+PKG_VERSION:=7.4.7

 PKG_RELEASE:=3
 PKG_RELEASE:=3

-PKG_MD5SUM:=f0ea2b372a7bdaf2613e92176ebf5e0f
+PKG_MD5SUM:=32dac2916d16287d95e0c958a75161fa

 
 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)/ \
 
 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
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(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

 
 

-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
+include $(TOPDIR)/package/rules.mk

 
 

-$(DL_DIR)/$(PKG_SOURCE):
-       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
+$(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)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
-       $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-       $(PATCH) $(PKG_BUILD_DIR) ./patches
-       touch $(PKG_BUILD_DIR)/.prepared
-
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:

 #      ./configure advertise "--infodir", but does not support it, replaced with "--docdir"
 #      ./configure advertise "--infodir", but does not support it, replaced with "--docdir"

-       (cd $(PKG_BUILD_DIR); rm -rf config.cache config.status; \
+       (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \

                $(TARGET_CONFIGURE_OPTS) \
                $(TARGET_CONFIGURE_OPTS) \

-               CFLAGS="$(TARGET_CFLAGS)" \
+               CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \

                CPPFLAGS="$$CPPFLAGS -I$(STAGING_DIR)/usr/include" \
                LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
                ./configure \
                CPPFLAGS="$$CPPFLAGS -I$(STAGING_DIR)/usr/include" \
                LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
                ./configure \


@@ -74,35 +67,51 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
                --without-tk \
                --with-zlib="yes" \
        );
                --without-tk \
                --with-zlib="yes" \
        );

-       touch $(PKG_BUILD_DIR)/.configured
-
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
-       $(MAKE) -C "$(PKG_BUILD_DIR)" \
-               $(TARGET_CONFIGURE_OPTS)
-       touch $(PKG_BUILD_DIR)/.built
+       touch $@

 
 

-$(STAGING_DIR)/usr/lib/libpq.so: $(PKG_BUILD_DIR)/.built
-       $(MAKE) -C "$(PKG_BUILD_DIR)" \
-               DESTDIR="$(STAGING_DIR)" \
-               install
+$(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): $(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_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_BUILD) $(IDIR_LIBPQ) $(PACKAGE_DIR)
 

-$(INFO_LIBPQ): $(IPKG_LIBPQ)
-       $(IPKG) install $(IPKG_LIBPQ)
+$(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

 
 

-prepare: $(PKG_BUILDPKG_SOURCE_DIR)/.prepared
-compile: $(IPKG_LIBPQ)
-install: $(INFO_LIBPQ)
+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*} \

 
 

-clean:
-       -$(MAKE) -C "$(PKG_BUILD_DIR)" \
-               DESTDIR="$(STAGING_DIR)" \
-               uninstall
-       rm -rf $(PKG_BUILD_DIR) $(IPKG_LIBPQ)
+compile: install-dev
+clean: uninstall-dev