qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 00:14:05 +02:00
Code

fix the target-local CONFIG_SITE export. apparently make can't do more than one of them in a single line

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14863 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2009-03-13 16:16:54 +00:00
parent 3f577f4c40
commit 26a4d6751b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/package.mk
View File

@ -68,7 +68,7 @@ define Build/DefaultTargets
$(if $(strip $(PKG_SOURCE_URL)),$(call Download,default)) $(if $(strip $(PKG_SOURCE_URL)),$(call Download,default))
$(call Build/Autoclean) $(call Build/Autoclean)
$(STAMP_PREPARED) : export PATH=$$(TARGET_PATH_PKG) CONFIG_SITE=$$(CONFIG_SITE) $(STAMP_PREPARED) : export PATH=$$(TARGET_PATH_PKG)
$(STAMP_PREPARED): $(STAMP_PREPARED):
@-rm -rf $(PKG_BUILD_DIR) @-rm -rf $(PKG_BUILD_DIR)
@mkdir -p $(PKG_BUILD_DIR) @mkdir -p $(PKG_BUILD_DIR)
@ -77,14 +77,16 @@ define Build/DefaultTargets
$(foreach hook,$(Hooks/Prepare/Post),$(call $(hook))$(sep)) $(foreach hook,$(Hooks/Prepare/Post),$(call $(hook))$(sep))
touch $$@ touch $$@
$(STAMP_CONFIGURED) : export PATH=$$(TARGET_PATH_PKG) CONFIG_SITE=$$(CONFIG_SITE) $(STAMP_CONFIGURED) : export PATH=$$(TARGET_PATH_PKG)
$(STAMP_CONFIGURED) : export CONFIG_SITE:=$$(CONFIG_SITE)
$(STAMP_CONFIGURED): $(STAMP_PREPARED) $(HOST_STAMP_INSTALLED) $(STAMP_CONFIGURED): $(STAMP_PREPARED) $(HOST_STAMP_INSTALLED)
$(foreach hook,$(Hooks/Configure/Pre),$(call $(hook))$(sep)) $(foreach hook,$(Hooks/Configure/Pre),$(call $(hook))$(sep))
$(Build/Configure) $(Build/Configure)
$(foreach hook,$(Hooks/Configure/Post),$(call $(hook))$(sep)) $(foreach hook,$(Hooks/Configure/Post),$(call $(hook))$(sep))
touch $$@ touch $$@
$(STAMP_BUILT) : export PATH=$$(TARGET_PATH_PKG) CONFIG_SITE=$$(CONFIG_SITE) $(STAMP_BUILT) : export PATH=$$(TARGET_PATH_PKG)
$(STAMP_BUILT) : export CONFIG_SITE:=$$(CONFIG_SITE)
$(STAMP_BUILT): $(STAMP_CONFIGURED) $(STAMP_BUILT): $(STAMP_CONFIGURED)
$(foreach hook,$(Hooks/Compile/Pre),$(call $(hook))$(sep)) $(foreach hook,$(Hooks/Compile/Pre),$(call $(hook))$(sep))
$(Build/Compile) $(Build/Compile)
@ -93,7 +95,7 @@ define Build/DefaultTargets
$(foreach hook,$(Hooks/Install/Post),$(call $(hook))$(sep)) $(foreach hook,$(Hooks/Install/Post),$(call $(hook))$(sep))
touch $$@ touch $$@
$(STAMP_INSTALLED) : export PATH=$$(TARGET_PATH_PKG) CONFIG_SITE=$$(CONFIG_SITE) $(STAMP_INSTALLED) : export PATH=$$(TARGET_PATH_PKG)
$(STAMP_INSTALLED): $(STAMP_BUILT) $(STAMP_INSTALLED): $(STAMP_BUILT)
$(SUBMAKE) -j1 clean-staging $(SUBMAKE) -j1 clean-staging
rm -rf $(TMP_DIR)/stage-$(PKG_NAME) rm -rf $(TMP_DIR)/stage-$(PKG_NAME)