hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move pkg config stuff to per-target exports to prevent interference with host builds 

SVN-Revision: 15299
owl
Felix Fietkau 2009-04-20 18:56:57 +00:00
parent 79a358ba02
commit 729e0fa4d1
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/host-build.mk
View File

@ -115,6 +115,8 @@ ifndef DUMP
$(call Host/Prepare) $(call Host/Prepare)
touch $$@ touch $$@
$(HOST_STAMP_CONFIGURED) : export PKG_CONFIG_PATH=$$(STAGING_DIR_HOST)/lib/pkgconfig
$(HOST_STAMP_CONFIGURED) : export PKG_CONFIG_LIBDIR=$$(STAGING_DIR_HOST)/lib/pkgconfig
$(HOST_STAMP_CONFIGURED): $(HOST_STAMP_PREPARED) $(HOST_STAMP_CONFIGURED): $(HOST_STAMP_PREPARED)
$(call Host/Configure) $(call Host/Configure)
touch $$@ touch $$@

3
include/package-defaults.mk
View File

@ -43,9 +43,6 @@ ifneq ($(strip $(PKG_UNPACK)),)
endef endef
endif endif
export PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig:$(STAGING_DIR_HOST)/usr/lib/pkgconfig
export PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig
CONFIGURE_PREFIX:=/usr CONFIGURE_PREFIX:=/usr
CONFIGURE_ARGS = \ CONFIGURE_ARGS = \
--target=$(GNU_TARGET_NAME) \ --target=$(GNU_TARGET_NAME) \

4
include/package.mk
View File

@ -78,6 +78,8 @@ define Build/DefaultTargets
$(STAMP_CONFIGURED) : export PATH=$$(TARGET_PATH_PKG) $(STAMP_CONFIGURED) : export PATH=$$(TARGET_PATH_PKG)
$(STAMP_CONFIGURED) : export CONFIG_SITE:=$$(CONFIG_SITE) $(STAMP_CONFIGURED) : export CONFIG_SITE:=$$(CONFIG_SITE)
$(STAMP_CONFIGURED) : export PKG_CONFIG_PATH=$$(STAGING_DIR)/usr/lib/pkgconfig
$(STAMP_CONFIGURED) : export PKG_CONFIG_LIBDIR=$$(STAGING_DIR)/usr/lib/pkgconfig
$(STAMP_CONFIGURED): $(STAMP_PREPARED) $(STAMP_CONFIGURED): $(STAMP_PREPARED)
$(foreach hook,$(Hooks/Configure/Pre),$(call $(hook))$(sep)) $(foreach hook,$(Hooks/Configure/Pre),$(call $(hook))$(sep))
$(Build/Configure) $(Build/Configure)
@ -86,6 +88,8 @@ define Build/DefaultTargets
$(STAMP_BUILT) : export PATH=$$(TARGET_PATH_PKG) $(STAMP_BUILT) : export PATH=$$(TARGET_PATH_PKG)
$(STAMP_BUILT) : export CONFIG_SITE:=$$(CONFIG_SITE) $(STAMP_BUILT) : export CONFIG_SITE:=$$(CONFIG_SITE)
$(STAMP_BUILT) : export PKG_CONFIG_PATH=$$(STAGING_DIR)/usr/lib/pkgconfig:$$(STAGING_DIR_HOST)/usr/lib/pkgconfig
$(STAMP_BUILT) : export PKG_CONFIG_LIBDIR=$$(STAGING_DIR)/usr/lib/pkgconfig
$(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)