diff --git a/archive-patches/pkgconf-pkg-config b/archive-patches/pkgconf-pkg-config new file mode 100644 index 00000000..5bd44e07 --- /dev/null +++ b/archive-patches/pkgconf-pkg-config @@ -0,0 +1,6 @@ +#!/bin/sh +set -x +PKGCONFDIR=$(dirname $0) +DEFAULT_PKG_CONFIG_LIBDIR=${PKGCONFDIR}/../../root/lib/pkgconfig +DEFAULT_PKG_CONFIG_SYSROOT_DIR=${PKGCONFDIR}/../../root +PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:-${DEFAULT_PKG_CONFIG_LIBDIR}} PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR:-${DEFAULT_PKG_CONFIG_SYSROOT_DIR}} exec ${PKGCONFDIR}/pkgconf "$@" diff --git a/make/host-tools.mk b/make/host-tools.mk index 0448f794..aa970e01 100644 --- a/make/host-tools.mk +++ b/make/host-tools.mk @@ -18,17 +18,19 @@ host-preqs: \ # ----------------------------------------------------------------------------- -HOST_PKG-CONFIG_VER = 0.29.2 - -$(ARCHIVE)/pkg-config-$(HOST_PKG-CONFIG_VER).tar.gz: - $(WGET) https://pkg-config.freedesktop.org/releases/pkg-config-$(HOST_PKG-CONFIG_VER).tar.gz - pkg-config-preqs: @PATH=$(subst $(HOST_DIR)/bin:,,$(PATH)); \ if ! pkg-config --exists glib-2.0; then \ echo "pkg-config and glib2-devel packages are needed for building cross-pkg-config."; false; \ fi +# ----------------------------------------------------------------------------- + +HOST_PKG-CONFIG_VER = 0.29.2 + +$(ARCHIVE)/pkg-config-$(HOST_PKG-CONFIG_VER).tar.gz: + $(WGET) https://pkg-config.freedesktop.org/releases/pkg-config-$(HOST_PKG-CONFIG_VER).tar.gz + host_pkg-config: $(HOST_DIR)/bin/pkg-config $(HOST_DIR)/bin/pkg-config: $(ARCHIVE)/pkg-config-$(HOST_PKG-CONFIG_VER).tar.gz | $(HOST_DIR)/bin pkg-config-preqs $(REMOVE)/pkg-config-$(HOST_PKG-CONFIG_VER) @@ -47,6 +49,31 @@ $(HOST_DIR)/bin/$(TARGET)-pkg-config: | $(HOST_DIR)/bin # ----------------------------------------------------------------------------- +HOST_PKGCONF_VER = 1.6.0 +HOST_PKGCONF_SOURCE = pkgconf-$(HOST_PKGCONF_VER).tar.gz + +$(ARCHIVE)/$(HOST_PKGCONF_SOURCE): + $(WGET) https://github.com/pkgconf/pkgconf/archive/$(HOST_PKGCONF_SOURCE) + +host_pkgconf: $(HOST_DIR)/bin/pkgconf +$(HOST_DIR)/bin/pkgconf: $(ARCHIVE)/$(HOST_PKGCONF_SOURCE) | $(HOST_DIR)/bin pkg-config-preqs + $(REMOVE)/pkgconf-pkgconf-$(HOST_PKGCONF_VER) + $(UNTAR)/$(HOST_PKGCONF_SOURCE) + $(CHDIR)/pkgconf-pkgconf-$(HOST_PKGCONF_VER); \ + ./autogen.sh -n; \ + ./configure \ + --prefix=$(HOST_DIR) \ + --with-sysroot=$(TARGET_DIR) \ + --with-system-libdir=$(TARGET_LIB_DIR) \ + --with-system-includedir=$(TARGET_INCLUDE_DIR) \ + ; \ + $(MAKE); \ + $(MAKE) install + install -m 0755 $(PATCHES)/pkgconf-pkg-config $(HOST_DIR)/bin/pkg-config + $(REMOVE)/pkgconf-pkgconf-$(HOST_PKGCONF_VER) + +# ----------------------------------------------------------------------------- + HOST_MTD-UTILS_VER = $(MTD-UTILS_VER) #$(ARCHIVE)/mtd-utils-$(HOST_MTD-UTILS_VER).tar.bz2: