diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-07-10 11:56:09 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-07-10 11:56:09 +0200 |
| commit | 972d8a700c42d25f3f1cca88f32f81cba3e72c21 (patch) | |
| tree | af593b487ad8551ca296edd43619be8c7332c5a2 | |
| parent | 1029010f3cb630df20caa018f1a8795fc17d0c60 (diff) | |
| download | embtoolkit-972d8a700c42d25f3f1cca88f32f81cba3e72c21.tar.gz embtoolkit-972d8a700c42d25f3f1cca88f32f81cba3e72c21.tar.bz2 embtoolkit-972d8a700c42d25f3f1cca88f32f81cba3e72c21.tar.xz | |
Build system: pkg-config machinery: also set PKG_CONFIG_LIBDIR for target
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
| -rw-r--r-- | mk/macros.mk | 7 | ||||
| -rw-r--r-- | mk/pkgconfig.mk | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/mk/macros.mk b/mk/macros.mk index 87f07b5..a02e21e 100644 --- a/mk/macros.mk +++ b/mk/macros.mk @@ -222,7 +222,7 @@ define embtk_configure_pkg $(call __embtk_configure_autoreconfpkg,$(1)) @test -e $($(PKGV)_SRC_DIR)/configure || exit 1 $(call __embtk_print_configure_opts,"$($(PKGV)_CONFIGURE_OPTS)") - @cd $($(PKGV)_BUILD_DIR); \ + $(Q)cd $($(PKGV)_BUILD_DIR); \ CC=$(TARGETCC_CACHED) \ CXX=$(TARGETCXX_CACHED) \ AR=$(TARGETAR) \ @@ -237,8 +237,9 @@ define embtk_configure_pkg CXXFLAGS="$(TARGET_CFLAGS)" \ LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \ CPPFLAGS="-I$(SYSROOT)/usr/include" \ - PKG_CONFIG=$(PKGCONFIG_BIN) \ - PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \ + PKG_CONFIG="$(PKGCONFIG_BIN)" \ + PKG_CONFIG_PATH="$(EMBTK_PKG_CONFIG_PATH)" \ + PKG_CONFIG_LIBDIR="$(EMBTK_PKG_CONFIG_LIBDIR)" \ ac_cv_func_malloc_0_nonnull=yes \ ac_cv_func_realloc_0_nonnull=yes \ $($(PKGV)_CONFIGURE_ENV) \ diff --git a/mk/pkgconfig.mk b/mk/pkgconfig.mk index d686bf3..0cf4852 100644 --- a/mk/pkgconfig.mk +++ b/mk/pkgconfig.mk @@ -34,7 +34,9 @@ PKGCONFIG_BUILD_DIR := $(TOOLS_BUILD)/pkg-config-$(PKGCONFIG_VERSION) PKGCONFIG_BIN := $(HOSTTOOLS)/usr/bin/pkg-config EMBTK_PKG_CONFIG_PATH := $(SYSROOT)/usr/$(LIBDIR)/pkgconfig -export PKGCONFIG_BIN EMBTK_PKG_CONFIG_PATH +EMBTK_PKG_CONFIG_LIBDIR := $(SYSROOT)/usr/$(LIBDIR) + +export PKGCONFIG_BIN EMBTK_PKG_CONFIG_PATH EMBTK_PKG_CONFIG_LIBDIR PKGCONFIG_PREFIX := /usr PKGCONFIG_DESTDIR := $(HOSTTOOLS) |