remove old chillispot ipkg control dir

[openwrt.git] / package / postgresql / Makefile

diff --git a/package/postgresql/Makefile b/package/postgresql/Makefile
index 6ed5b16..592d4cc 100644 (file)
--- a/package/postgresql/Makefile
+++ b/package/postgresql/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=postgresql
-PKG_VERSION:=7.4.6
+PKG_VERSION:=7.4.7
 PKG_RELEASE:=3
-PKG_MD5SUM:=f0ea2b372a7bdaf2613e92176ebf5e0f
+PKG_MD5SUM:=32dac2916d16287d95e0c958a75161fa
 
 PKG_SOURCE_URL:=\
        ftp://ftp3.us.postgresql.org/pub/postgresql/source/v$(PKG_VERSION)/ \
@@ -22,6 +22,11 @@ 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
 
+EXTRA_CFLAGS:=
+ifeq ($(BR2_GCC_3_4),y)
+       EXTRA_CFLAGS += -fno-unit-at-a-time
+endif
+
 $(DL_DIR)/$(PKG_SOURCE):
        $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
 
@@ -34,7 +39,7 @@ $(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)" \
+               CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
                CPPFLAGS="$$CPPFLAGS -I$(STAGING_DIR)/usr/include" \
                LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
                ./configure \
@@ -87,9 +92,9 @@ $(STAGING_DIR)/usr/lib/libpq.so: $(PKG_BUILD_DIR)/.built
                install
 
 $(IPKG_LIBPQ): $(STAGING_DIR)/usr/lib/libpq.so
-       $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBPQ) libpq.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+       $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBPQ) ./ipkg/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/
+       cp -fpR $(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)
@@ -97,7 +102,7 @@ $(IPKG_LIBPQ): $(STAGING_DIR)/usr/lib/libpq.so
 $(INFO_LIBPQ): $(IPKG_LIBPQ)
        $(IPKG) install $(IPKG_LIBPQ)
 
-prepare: $(PKG_BUILDPKG_SOURCE_DIR)/.prepared
+prepare: $(PKG_BUILD_DIR)/.prepared
 compile: $(IPKG_LIBPQ)
 install: $(INFO_LIBPQ)