tools/pkgconf: add PKG_CPE_ID

[openwrt/staging/jow.git] / tools / pkgconf / Makefile

diff --git a/tools/pkgconf/Makefile b/tools/pkgconf/Makefile
index cefee1edf06f1fa652911b8b72c0738d86b5d179..c6e11edaf2b50eea9fb7699833a3ad4160ad247c 100644 (file)
--- a/tools/pkgconf/Makefile
+++ b/tools/pkgconf/Makefile
@@ -7,27 +7,34 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pkgconf
-PKG_VERSION:=1.6.3
+PKG_VERSION:=1.9.4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://distfiles.dereferenced.org/pkgconf
-PKG_HASH:=61f0b31b0d5ea0e862b454a80c170f57bad47879c0c42bd8de89200ff62ea210
+PKG_HASH:=daccf1bbe5a30d149b556c7d2ffffeafd76d7b514e249271abdd501533c1d8ae
 
-HOST_BUILD_PARALLEL:=1
+PKG_CPE_ID:=cpe:/a:pkgconf:pkgconf
 
 include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/meson.mk
 
 unexport PKG_CONFIG
 
+HOSTCC := $(HOSTCC_NOCACHE)
+
+MESON_HOST_ARGS += \
+       -Ddefault_library=static \
+       -Dtests=disabled
+
 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))