X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=include%2Fpackage.mk;h=8819a115647a132ebb6bd1815ed16a1e25f18bcc;hp=9097d7b0bf6ed85c2c593ff6a460f5e191603a12;hb=bcf75aca7b19a81a7c03b7bd31cb8056f79b3a2d;hpb=3de5e1d29a29920511a073eba38b7598e2a61ea6

diff --git a/include/package.mk b/include/package.mk
index 9097d7b0bf..8819a11564 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -27,9 +27,12 @@ include $(INCLUDE_DIR)/package-defaults.mk
 include $(INCLUDE_DIR)/package-dumpinfo.mk
 include $(INCLUDE_DIR)/package-ipkg.mk
 include $(INCLUDE_DIR)/package-bin.mk
+include $(INCLUDE_DIR)/autotools.mk
 
 override MAKEFLAGS=
-export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
+export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(patsubst %gnueabi,%,$(REAL_GNU_TARGET_NAME))
+CUR_MAKEFILE:=$(filter-out Makefile,$(firstword $(MAKEFILE_LIST)))
+SUBMAKE:=$(NO_TRACE_MAKE) $(if $(CUR_MAKEFILE),-f $(CUR_MAKEFILE))
 
 ifeq ($(DUMP)$(filter prereq clean refresh update,$(MAKECMDGOALS)),)
   ifneq ($(if $(QUILT),,$(CONFIG_AUTOREBUILD)),)
@@ -46,10 +49,15 @@ define Download/default
   URL:=$(PKG_SOURCE_URL)
   SUBDIR:=$(PKG_SOURCE_SUBDIR)
   PROTO:=$(PKG_SOURCE_PROTO)
+  $(if $(PKG_SOURCE_MIRROR),MIRROR:=$(filter 1,$(PKG_MIRROR)))
   VERSION:=$(PKG_SOURCE_VERSION)
   MD5SUM:=$(PKG_MD5SUM)
 endef
 
+define sep
+
+endef
+
 define Build/DefaultTargets
   $(if $(QUILT),$(Build/Quilt))
   $(if $(strip $(PKG_SOURCE_URL)),$(call Download,default))
@@ -58,29 +66,31 @@ define Build/DefaultTargets
   $(STAMP_PREPARED):
 	@-rm -rf $(PKG_BUILD_DIR)
 	@mkdir -p $(PKG_BUILD_DIR)
+	$(foreach hook,$(Hooks/Prepare/Pre),$(call $(hook))$(sep))
 	$(Build/Prepare)
+	$(foreach hook,$(Hooks/Prepare/Post),$(call $(hook))$(sep))
 	touch $$@
 
   $(STAMP_CONFIGURED): $(STAMP_PREPARED)
+	$(foreach hook,$(Hooks/Configure/Pre),$(call $(hook))$(sep))
 	$(Build/Configure)
+	$(foreach hook,$(Hooks/Configure/Post),$(call $(hook))$(sep))
 	touch $$@
 
   $(STAMP_BUILT): $(STAMP_CONFIGURED)
+	$(foreach hook,$(Hooks/Compile/Pre),$(call $(hook))$(sep))
 	$(Build/Compile)
+	$(foreach hook,$(Hooks/Compile/Post),$(call $(hook))$(sep))
 	touch $$@
 
   $(STAMP_INSTALLED): $(STAMP_BUILT)
-	$(NO_TRACE_MAKE) clean-staging
+	$(SUBMAKE) -j1 clean-staging
 	rm -rf $(TMP_DIR)/stage-$(PKG_NAME)
-	mkdir -p $(TMP_DIR)/stage-$(PKG_NAME) $(STAGING_DIR)/packages $(STAGING_DIR_HOST)/packages
-	$(call Build/InstallDev,$(TMP_DIR)/stage-$(PKG_NAME)/target,$(TMP_DIR)/stage-$(PKG_NAME)/host)
-	if [ -d $(TMP_DIR)/stage-$(PKG_NAME)/target ]; then \
-		(cd $(TMP_DIR)/stage-$(PKG_NAME)/target; find > $(STAGING_DIR)/packages/$(PKG_NAME).list); \
-		$(CP) $(TMP_DIR)/stage-$(PKG_NAME)/target/* $(STAGING_DIR)/; \
-	fi
-	if [ -d $(TMP_DIR)/stage-$(PKG_NAME)/host ]; then \
-		(cd $(TMP_DIR)/stage-$(PKG_NAME)/host; find > $(STAGING_DIR_HOST)/packages/$(PKG_NAME).list); \
-		$(CP) $(TMP_DIR)/stage-$(PKG_NAME)/host/* $(STAGING_DIR_HOST)/; \
+	mkdir -p $(TMP_DIR)/stage-$(PKG_NAME)/host $(STAGING_DIR)/packages $(STAGING_DIR_HOST)/packages
+	$(call Build/InstallDev,$(TMP_DIR)/stage-$(PKG_NAME),$(TMP_DIR)/stage-$(PKG_NAME)/host)
+	if [ -d $(TMP_DIR)/stage-$(PKG_NAME) ]; then \
+		(cd $(TMP_DIR)/stage-$(PKG_NAME); find ./ > $(STAGING_DIR)/packages/$(PKG_NAME).list); \
+		$(CP) $(TMP_DIR)/stage-$(PKG_NAME)/* $(STAGING_DIR)/; \
 	fi
 	rm -rf $(TMP_DIR)/stage-$(PKG_NAME)
 	touch $$@
@@ -130,18 +140,6 @@ endif
   $(if $(DUMP),,$(call Build/DefaultTargets,$(1)))
 endef
 
-# prevent libtool from setting rpath when linking
-define libtool_disable_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 libtool_fixup_libdir
-	find $(PKG_BUILD_DIR) -name '*.la' | $(XARGS) \
-		$(SED) "s,^libdir='/usr/lib',libdir='$(strip $(1))/usr/lib',g"
-endef
-
 define pkg_install_files
 	$(foreach install_file,$(1),$(INSTALL_DIR) $(3)/`dirname $(install_file)`; $(INSTALL_DATA) $(2)/$(install_file) $(3)/`dirname $(install_file)`;)
 endef
@@ -173,12 +171,12 @@ compile:
 install:
 clean-staging: FORCE
 	rm -f $(STAMP_INSTALLED)
-	for dir in "$(STAGING_DIR)" "$(STAGING_DIR_HOST)"; do (\
-		cd $$dir; \
+	@-(\
+		cd "$(STAGING_DIR)"; \
 		if [ -f packages/$(PKG_NAME).list ]; then \
 			cat packages/$(PKG_NAME).list | xargs -r rm -f 2>/dev/null; \
 		fi; \
-	) done;
+	)
 
 clean: clean-staging FORCE
 	$(call Build/UninstallDev,$(STAGING_DIR),$(STAGING_DIR_HOST))