mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-24 05:11:46 +02:00
move pkg config stuff to per-target exports to prevent interference with host builds
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15299 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
ba25e57dcc
commit
2c740480ef
@ -115,6 +115,8 @@ ifndef DUMP
|
||||
$(call Host/Prepare)
|
||||
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)
|
||||
$(call Host/Configure)
|
||||
touch $$@
|
||||
|
@ -43,9 +43,6 @@ ifneq ($(strip $(PKG_UNPACK)),)
|
||||
endef
|
||||
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_ARGS = \
|
||||
--target=$(GNU_TARGET_NAME) \
|
||||
|
@ -78,6 +78,8 @@ define Build/DefaultTargets
|
||||
|
||||
$(STAMP_CONFIGURED) : export PATH=$$(TARGET_PATH_PKG)
|
||||
$(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)
|
||||
$(foreach hook,$(Hooks/Configure/Pre),$(call $(hook))$(sep))
|
||||
$(Build/Configure)
|
||||
@ -86,6 +88,8 @@ define Build/DefaultTargets
|
||||
|
||||
$(STAMP_BUILT) : export PATH=$$(TARGET_PATH_PKG)
|
||||
$(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)
|
||||
$(foreach hook,$(Hooks/Compile/Pre),$(call $(hook))$(sep))
|
||||
$(Build/Compile)
|
||||
|
Loading…
Reference in New Issue
Block a user