diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-04-20 18:56:57 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-04-20 18:56:57 +0000 |
| commit | 6937a43f9be9aa0f730112203fa5ebe63db67964 (patch) | |
| tree | 4ec0bbb4e5f6fd27978bfb982f85d22c5140819d /include/package.mk | |
| parent | 33334cc3b611c4895c0e81b404e3ccd01a42b408 (diff) | |
| download | upstream-6937a43f9be9aa0f730112203fa5ebe63db67964.tar.gz upstream-6937a43f9be9aa0f730112203fa5ebe63db67964.tar.bz2 upstream-6937a43f9be9aa0f730112203fa5ebe63db67964.zip | |
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
Diffstat (limited to 'include/package.mk')
| -rw-r--r-- | include/package.mk | 4 |
1 files changed, 4 insertions, 0 deletions
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) |