diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-05-19 21:31:41 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-05-19 21:31:41 +0200 |
| commit | 900c4c932cd7f70e0f375beb6c61df243852895d (patch) | |
| tree | e47f2b613078278ea037dc1bf453dc677e0a4c68 /mk | |
| parent | 5a494b5c7227caeff3fc880c426cc0b27cc78ed8 (diff) | |
| download | embtoolkit-900c4c932cd7f70e0f375beb6c61df243852895d.tar.gz embtoolkit-900c4c932cd7f70e0f375beb6c61df243852895d.tar.bz2 embtoolkit-900c4c932cd7f70e0f375beb6c61df243852895d.tar.xz | |
Host tools: pkgconfig: make it search on more locations
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/macros.mk | 4 | ||||
| -rw-r--r-- | mk/pkgconfig.mk | 18 |
2 files changed, 18 insertions, 4 deletions
diff --git a/mk/macros.mk b/mk/macros.mk index f34d520..3ef5940 100644 --- a/mk/macros.mk +++ b/mk/macros.mk @@ -79,5 +79,9 @@ embtk_pwarning = $(call embtk_echo_yellow,"$(__embtk_msg_h)\\n~~ EmbToolkit ~~ W embtk_perror = $(call embtk_echo_red,"$(__embtk_msg_h)\\n~~ EmbToolkit ~~ ERROR: $(1)\\n$(__embtk_msg_h)") embtk_pinfo = $(call embtk_echo_blue,"$(__embtk_msg_h)\n~~ EmbToolkit ~~ $(1)\n$(__embtk_msg_h)") +# Macros for emmpty and space +__embtk_empty := +__embtk_space :=$(__embtk_empty) $(__embtk_empty) + # Packages management macros include $(EMBTK_ROOT)/mk/macros.packages.mk diff --git a/mk/pkgconfig.mk b/mk/pkgconfig.mk index de38ce7..060a53b 100644 --- a/mk/pkgconfig.mk +++ b/mk/pkgconfig.mk @@ -26,15 +26,25 @@ PKGCONFIG_NAME := pkg-config PKGCONFIG_VERSION := $(call embtk_get_pkgversion,pkgconfig) PKGCONFIG_SITE := http://pkgconfig.freedesktop.org/releases -PKGCONFIG_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror PKGCONFIG_PACKAGE := pkg-config-$(PKGCONFIG_VERSION).tar.gz PKGCONFIG_SRC_DIR := $(TOOLS_BUILD)/pkg-config-$(PKGCONFIG_VERSION) PKGCONFIG_BUILD_DIR := $(TOOLS_BUILD)/pkg-config-$(PKGCONFIG_VERSION) PKGCONFIG_BIN := $(HOSTTOOLS)/usr/bin/pkg-config -EMBTK_PKG_CONFIG_PATH := $(SYSROOT)/usr/$(LIBDIR)/pkgconfig -EMBTK_PKG_CONFIG_LIBDIR := $(SYSROOT)/usr/$(LIBDIR)/pkgconfig -EMBTK_HOST_PKG_CONFIG_PATH := $(HOSTTOOLS)/usr/lib/pkgconfig:/usr/lib/pkgconfig + +__EMBTK_PKG_CONFIG_PATH := $(SYSROOT)/usr/$(LIBDIR)/pkgconfig +__EMBTK_PKG_CONFIG_PATH += $(SYSROOT)/usr/share/pkgconfig +EMBTK_PKG_CONFIG_PATH := $(subst $(__embtk_space),:,$(__EMBTK_PKG_CONFIG_PATH)) +EMBTK_PKG_CONFIG_LIBDIR := $(EMBTK_PKG_CONFIG_PATH) + +__EMBTK_HOST_PKG_CONFIG_PATH := $(HOSTTOOLS)/usr/lib/pkgconfig/ +__EMBTK_HOST_PKG_CONFIG_PATH += /usr/lib/pkgconfig/ /usr/share/pkgconfig/ +__EMBTK_HOST_PKG_CONFIG_PATH += /usr/local/lib/pkgconfig/ /usr/local/share/pkgconfig/ +__EMBTK_HOST_PKG_CONFIG_PATH += $(dir $(shell find /usr/lib -type f -name '*.pc')) +__EMBTK_HOST_PKG_CONFIG_PATH += $(dir $(shell find /usr/local/lib -type f -name '*.pc')) +EMBTK_HOST_PKG_CONFIG_PATH := $(subst $(__embtk_space),:,$(sort $(__EMBTK_HOST_PKG_CONFIG_PATH))) + +PKGCONFIG_CONFIGURE_OPTS := --with-pc-path="$(EMBTK_HOST_PKG_CONFIG_PATH)" export PKGCONFIG_BIN EMBTK_PKG_CONFIG_PATH EMBTK_PKG_CONFIG_LIBDIR export EMBTK_HOST_PKG_CONFIG_PATH |