From b183ad30e97505a95e9e20a62f0dabe1afaa0764 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 12 May 2005 21:32:55 +0000 Subject: fix postgres build with gcc 3.4+ git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@860 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/postgresql/Makefile | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'package') diff --git a/package/postgresql/Makefile b/package/postgresql/Makefile index 592d4cc34..5c0226646 100644 --- a/package/postgresql/Makefile +++ b/package/postgresql/Makefile @@ -22,11 +22,6 @@ 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) @@ -82,14 +77,16 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared touch $(PKG_BUILD_DIR)/.configured $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured - $(MAKE) -C "$(PKG_BUILD_DIR)" \ - $(TARGET_CONFIGURE_OPTS) + $(MAKE) -C "$(PKG_BUILD_DIR)/src" \ + $(TARGET_CONFIGURE_OPTS) \ + submake-libpq touch $(PKG_BUILD_DIR)/.built $(STAGING_DIR)/usr/lib/libpq.so: $(PKG_BUILD_DIR)/.built $(MAKE) -C "$(PKG_BUILD_DIR)" \ DESTDIR="$(STAGING_DIR)" \ - install + install-all-headers + cp -a $(PKG_BUILD_DIR)/src/interfaces/libpq/libpq.so* $(STAGING_DIR)/usr/lib $(IPKG_LIBPQ): $(STAGING_DIR)/usr/lib/libpq.so $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBPQ) ./ipkg/libpq.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) -- cgit v1.2.3