summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2018-10-09 06:35:42 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2018-10-09 08:47:13 +0200
commitb60fe8d629f5ea1bf84ba4b97b7109001623ead3 (patch)
tree35d44b4780d2770fbcb541e0eaf7e253fd399686
parent6f4d325df5519daf8c16f3a17c72fcc633c61290 (diff)
downloadptxdist-b60fe8d629f5ea1bf84ba4b97b7109001623ead3.tar.gz
ptxdist-b60fe8d629f5ea1bf84ba4b97b7109001623ead3.tar.xz
host-pkg-config: enable dev package
Now, that the pkg-config wrapper is used for host-pkg-config as well, installing directly to sysroot is no longer needed. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/host-pkg-config.make9
1 files changed, 4 insertions, 5 deletions
diff --git a/rules/host-pkg-config.make b/rules/host-pkg-config.make
index d4f72c11c..ef3a22c4a 100644
--- a/rules/host-pkg-config.make
+++ b/rules/host-pkg-config.make
@@ -23,7 +23,6 @@ HOST_PKG_CONFIG_SUFFIX := tar.gz
HOST_PKG_CONFIG_URL := http://pkgconfig.freedesktop.org/releases/$(HOST_PKG_CONFIG).$(HOST_PKG_CONFIG_SUFFIX)
HOST_PKG_CONFIG_SOURCE := $(SRCDIR)/$(HOST_PKG_CONFIG).$(HOST_PKG_CONFIG_SUFFIX)
HOST_PKG_CONFIG_DIR := $(HOST_BUILDDIR)/$(HOST_PKG_CONFIG)
-HOST_PKG_CONFIG_DEVPKG := NO
HOST_PKG_CONFIG_LICENSE := GPL-2.0-only
# ----------------------------------------------------------------------------
@@ -35,7 +34,7 @@ HOST_PKG_CONFIG_LICENSE := GPL-2.0-only
#
HOST_PKG_CONFIG_CONF_TOOL := autoconf
HOST_PKG_CONFIG_CONF_OPT := \
- $(HOST_AUTOCONF_SYSROOT) \
+ $(HOST_AUTOCONF) \
--disable-host-tool \
--with-internal-glib
@@ -49,10 +48,10 @@ PKG_CONFIG_SCRIPT = \
$(STATEDIR)/host-pkg-config.install:
@$(call targetinfo)
@$(call world/install, HOST_PKG_CONFIG)
- @mv $(PTXDIST_SYSROOT_HOST)/bin/pkg-config \
- $(PTXDIST_SYSROOT_HOST)/bin/pkg-config.real
+ @mv $(HOST_PKG_CONFIG_PKGDIR)/bin/pkg-config \
+ $(HOST_PKG_CONFIG_PKGDIR)/bin/pkg-config.real
@ln -sv $(PKG_CONFIG_SCRIPT) \
- $(PTXDIST_SYSROOT_HOST)/bin/pkg-config
+ $(HOST_PKG_CONFIG_PKGDIR)/bin/pkg-config
@$(call touch)
# vim: syntax=make