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

diff --git a/include/host-build.mk b/include/host-build.mk
index ffba12b51d2fcbfae7a4ab242bc5793bb9e662ad..1a794846bbf1b4cc40d20e793d4c7d85c76b4e6f 100644 (file)
--- a/include/host-build.mk
+++ b/include/host-build.mk
@@ -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 $$@

diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index e375722af905f91ec7979f62beee0b757b4e73cb..1eae7ea246c2027a8dcd66b1169bb786629e1f79 100644 (file)
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -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) \

diff --git a/include/package.mk b/include/package.mk
index 719468c2532db8e8424567c9a0d99e62f0d51d29..2049e2f316a0838e8f47ee91ec350752ba26a6be 100644 (file)
--- a/include/package.mk
+++ b/include/package.mk
@@ -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)