aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-04-20 18:56:57 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-04-20 18:56:57 +0000
commit729e0fa4d14af178431415abab3f4349d517cdd4 (patch)
tree63e22466ad2cea3b69ece62f6bdd67d78aa6dd1a
parent79a358ba0283fb6bc9a50cabd90743fc3c1fa018 (diff)
downloadupstream-729e0fa4d14af178431415abab3f4349d517cdd4.tar.gz
upstream-729e0fa4d14af178431415abab3f4349d517cdd4.tar.bz2
upstream-729e0fa4d14af178431415abab3f4349d517cdd4.zip
move pkg config stuff to per-target exports to prevent interference with host builds
SVN-Revision: 15299
-rw-r--r--include/host-build.mk2
-rw-r--r--include/package-defaults.mk3
-rw-r--r--include/package.mk4
3 files changed, 6 insertions, 3 deletions
diff --git a/include/host-build.mk b/include/host-build.mk
index ffba12b51d..1a794846bb 100644
--- 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 e375722af9..1eae7ea246 100644
--- 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 719468c253..2049e2f316 100644
--- 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)