X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=include%2Fpackage.mk;h=81296b8446244c64d0d08528f8c47fbc73b25c95;hb=cb11efc85b0b404eb4bf01cce6cd857e491f2628;hp=e322cb908ca2d96bff5531b3f7f118c7d7d88429;hpb=6814b92ca911e1113c6527475627aeda700bdb10;p=openwrt.git

diff --git a/include/package.mk b/include/package.mk
index e322cb908c..81296b8446 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006,2007 OpenWrt.org
+# Copyright (C) 2006-2007 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,6 +9,7 @@ all: $(if $(DUMP),dumpinfo,compile)
 
 PKG_BUILD_DIR ?= $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR ?= $(PKG_BUILD_DIR)/ipkg-install
+PKG_MD5SUM ?= unknown
 
 include $(INCLUDE_DIR)/prereq.mk
 include $(INCLUDE_DIR)/host.mk
@@ -24,18 +25,20 @@ include $(INCLUDE_DIR)/package-defaults.mk
 include $(INCLUDE_DIR)/package-dumpinfo.mk
 include $(INCLUDE_DIR)/package-ipkg.mk
 
+override MAKEFLAGS=
 export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
 
 ifeq ($(DUMP)$(filter prereq clean refresh update,$(MAKECMDGOALS)),)
-  ifneq ($(CONFIG_AUTOREBUILD),)
+  ifneq ($(if $(QUILT),,$(CONFIG_AUTOREBUILD)),)
     define Build/Autoclean
       $(PKG_BUILD_DIR)/.dep_files: $(STAMP_PREPARED)
       $(call rdep,${CURDIR} $(PKG_FILE_DEPEND),$(STAMP_PREPARED))
-      $(call rdep,$(PKG_BUILD_DIR),$(STAMP_BUILT),$(PKG_BUILD_DIR)/.dep_files, -and -not -path "/.*" -and -not -path "*/ipkg*")
+      $(if $(filter prepare,$(MAKECMDGOALS)),,$(call rdep,$(PKG_BUILD_DIR),$(STAMP_BUILT),$(PKG_BUILD_DIR)/.dep_files, -and -not -path "/.*" -and -not -path "*/ipkg*"))
     endef
   endif
 endif
 
+
 define Build/DefaultTargets
   ifneq ($(strip $(PKG_SOURCE_URL)),)
     download: $(DL_DIR)/$(PKG_SOURCE)
@@ -61,13 +64,12 @@ define Build/DefaultTargets
 
   $(STAMP_BUILT): $(STAMP_CONFIGURED)
 	$(Build/Compile)
-	@$(NO_TRACE_MAKE) $(PKG_BUILD_DIR)/.dep_files
 	touch $$@
 
   ifdef Build/InstallDev
-    compile: $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed
-    $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed: $(STAMP_BUILT)
-	mkdir -p $(STAGING_DIR)/stampfiles
+    compile: $(STAGING_DIR)/stamp/.$(PKG_NAME)-installed
+    $(STAGING_DIR)/stamp/.$(PKG_NAME)-installed: $(STAMP_BUILT)
+	mkdir -p $(STAGING_DIR)/stamp
 	$(Build/InstallDev)
 	touch $$@
   endif
@@ -102,6 +104,18 @@ endif
   $(BuildIPKG)
 endef
 
+# prevent libtool from setting rpath when linking
+define Build/Fix/libtool/rpath
+	find $(PKG_BUILD_DIR) -name 'libtool' | xargs \
+		$(SED) 's,^hardcode_libdir_flag_spec=.*,hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ ",g'
+endef
+
+# prevent libtool from linking against host development libraries
+define Build/Fix/libtool/libdir
+	find $(PKG_BUILD_DIR) -name '*.la' | xargs \
+		$(SED) "s,^libdir='/usr/lib',libdir='$(STAGING_DIR)/usr/lib',g"
+endef
+
 define Build/Prepare
   $(call Build/Prepare/Default,)
 endef
@@ -126,5 +140,5 @@ install:
 clean: FORCE
 	$(Build/UninstallDev)
 	$(Build/Clean)
-	@rm -f $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed
+	@rm -f $(STAGING_DIR)/stamp/.$(PKG_NAME)-installed
 	@rm -rf $(PKG_BUILD_DIR)