From fa803d29673e308117ed55c26fa17cfeea92d452 Mon Sep 17 00:00:00 2001 From: acoul Date: Fri, 22 Oct 2010 13:59:29 +0000 Subject: [PATCH] utils/smartmontools: fix a cross compile issue (thank you mbm) git-svn-id: svn://svn.openwrt.org/openwrt/packages@23584 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- utils/smartmontools/Makefile | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/utils/smartmontools/Makefile b/utils/smartmontools/Makefile index 5b98d58e9..9220aeab7 100644 --- a/utils/smartmontools/Makefile +++ b/utils/smartmontools/Makefile @@ -34,28 +34,22 @@ endef # uses GNU configure -define Build/Configure - (cd $(PKG_BUILD_DIR); \ - ./autogen.sh \ - ./configure \ - CC="$(TARGET_CC)" \ - CXX="$(TARGET_CXX)" \ - CPP="$(TARGET_CPP)" \ - CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \ - CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++ -I$(LINUX_DIR)/include" \ - LDFLAGS="$$$$LDFLAGS" \ - LIBS="-nodefaultlibs -luClibc++ -lm $(LIBGCC_S) -lc" \ - --prefix=/usr \ - --build=$(GNU_BUILD_NAME) \ - --host=$(GNU_HOST_NAME) \ - --target=$(GNU_TARGET_NAME) \ +CONFIGURE_VARS += \ + CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \ + CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++ -I$(LINUX_DIR)/include" \ + LDFLAGS="$$$$LDFLAGS" \ + LIBS="-nodefaultlibs -luClibc++ -lm $(LIBGCC_S) -lc" \ + +define Build/Configure + (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ + ./autogen.sh \ ); - $(call Build/Configure/Default,, \ - ) + $(call Build/Configure/Default) endef define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) + $(MAKE) -C $(PKG_BUILD_DIR) \ + LD="$(TARGET_CXX)" endef define Package/smartmontools/install