From aa344bcfa86264f74513d11c780f5612481d1c99 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 18 Jun 2021 19:53:17 -0700 Subject: tools/pkgconf: update to 1.8.0 Switch to compiling with meson for faster and more reliable compilation. Signed-off-by: Rosen Penev --- tools/pkgconf/Makefile | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'tools/pkgconf/Makefile') diff --git a/tools/pkgconf/Makefile b/tools/pkgconf/Makefile index 0f56de0e29..d2f3252b12 100644 --- a/tools/pkgconf/Makefile +++ b/tools/pkgconf/Makefile @@ -7,29 +7,32 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pkgconf -PKG_VERSION:=1.7.3 +PKG_VERSION:=1.8.0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://distfiles.dereferenced.org/pkgconf -PKG_HASH:=b846aea51cf696c3392a0ae58bef93e2e72f8e7073ca6ad1ed8b01c85871f9c0 - -HOST_BUILD_PARALLEL:=1 +PKG_HASH:=ef9c7e61822b7cb8356e6e9e1dca58d9556f3200d78acab35e4347e9d4c2bbaf include $(INCLUDE_DIR)/host-build.mk +include $(INCLUDE_DIR)/meson.mk unexport PKG_CONFIG HOSTCC := $(HOSTCC_NOCACHE) +MESON_HOST_ARGS += \ + -Ddefault_library=static \ + -Dtests=false + define Host/Install - $(MAKE) -C $(HOST_BUILD_DIR) install + $(call Host/Install/Meson) mv $(STAGING_DIR_HOST)/bin/pkgconf $(STAGING_DIR_HOST)/bin/pkg-config.real $(INSTALL_BIN) ./files/pkg-config $(STAGING_DIR_HOST)/bin/pkg-config endef define Host/Clean - -$(MAKE) -C $(HOST_BUILD_DIR) uninstall - $(call Host/Clean/Default) + rm -f $(STAGING_DIR_HOST)/bin/pkg-config.real $(STAGING_DIR_HOST)/bin/pkg-config + $(call Host/Clean/Meson) endef $(eval $(call HostBuild)) -- cgit v1.2.3