tools/expat: fix PKG_CPE_ID

[openwrt/openwrt.git] / tools / expat / Makefile

diff --git a/tools/expat/Makefile b/tools/expat/Makefile
index 1f856c9117bad9f51e6c0fb2686912027f6e9037..8c15f98a22086e4425c572cc017303c182a1d751 100644 (file)
--- a/tools/expat/Makefile
+++ b/tools/expat/Makefile
@@ -8,18 +8,27 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=expat
-PKG_VERSION:=2.2.3
+PKG_CPE_ID:=cpe:/a:libexpat:libexpat
+PKG_VERSION:=2.6.2
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_HASH:=b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f
-PKG_SOURCE_URL:=@SF/expat
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_HASH:=d4cf38d26e21a56654ffe4acd9cd5481164619626802328506a2869afab29ab3
+PKG_SOURCE_URL:=https://github.com/libexpat/libexpat/releases/download/R_$(subst .,_,$(PKG_VERSION))
 
 HOST_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
 
-define Host/Install
-       $(MAKE) -C $(HOST_BUILD_DIR) install
+HOSTCC := $(HOSTCC_NOCACHE)
+
+HOST_CONFIGURE_ARGS += \
+       --disable-shared \
+       --without-docbook \
+       --without-tests \
+       --with-pic
+
+define Host/Uninstall
+       -$(call Host/Compile/Default,uninstall)
 endef
 
 $(eval $(call HostBuild))