aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-03-12 13:57:56 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-03-12 13:57:56 +0000
commit3be17f26d55c2a98a1a831bee578d044789eca48 (patch)
treeee57b960be5de720b7797351d40ce7aadee57dbe
parent4750ec9396662d2c0024ad853e3fc854bab04f48 (diff)
downloadupstream-3be17f26d55c2a98a1a831bee578d044789eca48.tar.gz
upstream-3be17f26d55c2a98a1a831bee578d044789eca48.tar.bz2
upstream-3be17f26d55c2a98a1a831bee578d044789eca48.zip
move the CONFIG_SITE export to target-local exports
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14851 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/package.mk9
1 files changed, 4 insertions, 5 deletions
diff --git a/include/package.mk b/include/package.mk
index 8083632684..489ed9b527 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -36,7 +36,6 @@ CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
ifneq ($(CONFIG_LINUX_2_4),)
CONFIG_SITE:=$(subst linux-,linux2.4-,$(CONFIG_SITE))
endif
-export CONFIG_SITE
CUR_MAKEFILE:=$(filter-out Makefile,$(firstword $(MAKEFILE_LIST)))
SUBMAKE:=$(NO_TRACE_MAKE) $(if $(CUR_MAKEFILE),-f $(CUR_MAKEFILE))
@@ -69,7 +68,7 @@ define Build/DefaultTargets
$(if $(strip $(PKG_SOURCE_URL)),$(call Download,default))
$(call Build/Autoclean)
- $(STAMP_PREPARED) : export PATH=$$(TARGET_PATH_PKG)
+ $(STAMP_PREPARED) : export PATH=$$(TARGET_PATH_PKG) CONFIG_SITE=$$(CONFIG_SITE)
$(STAMP_PREPARED):
@-rm -rf $(PKG_BUILD_DIR)
@mkdir -p $(PKG_BUILD_DIR)
@@ -78,14 +77,14 @@ define Build/DefaultTargets
$(foreach hook,$(Hooks/Prepare/Post),$(call $(hook))$(sep))
touch $$@
- $(STAMP_CONFIGURED) : export PATH=$$(TARGET_PATH_PKG)
+ $(STAMP_CONFIGURED) : export PATH=$$(TARGET_PATH_PKG) CONFIG_SITE=$$(CONFIG_SITE)
$(STAMP_CONFIGURED): $(STAMP_PREPARED) $(HOST_STAMP_INSTALLED)
$(foreach hook,$(Hooks/Configure/Pre),$(call $(hook))$(sep))
$(Build/Configure)
$(foreach hook,$(Hooks/Configure/Post),$(call $(hook))$(sep))
touch $$@
- $(STAMP_BUILT) : export PATH=$$(TARGET_PATH_PKG)
+ $(STAMP_BUILT) : export PATH=$$(TARGET_PATH_PKG) CONFIG_SITE=$$(CONFIG_SITE)
$(STAMP_BUILT): $(STAMP_CONFIGURED)
$(foreach hook,$(Hooks/Compile/Pre),$(call $(hook))$(sep))
$(Build/Compile)
@@ -94,7 +93,7 @@ define Build/DefaultTargets
$(foreach hook,$(Hooks/Install/Post),$(call $(hook))$(sep))
touch $$@
- $(STAMP_INSTALLED) : export PATH=$$(TARGET_PATH_PKG)
+ $(STAMP_INSTALLED) : export PATH=$$(TARGET_PATH_PKG) CONFIG_SITE=$$(CONFIG_SITE)
$(STAMP_INSTALLED): $(STAMP_BUILT)
$(SUBMAKE) -j1 clean-staging
rm -rf $(TMP_DIR)/stage-$(PKG_NAME)