tools/expat: fix PKG_CPE_ID

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

diff --git a/tools/expat/Makefile b/tools/expat/Makefile
index fc339f818a32ce4183e494bec66927ebbc8848d6..8c15f98a22086e4425c572cc017303c182a1d751 100644 (file)
--- a/tools/expat/Makefile
+++ b/tools/expat/Makefile
@@ -8,26 +8,27 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=expat
-PKG_CPE_ID:=cpe:/a:libexpat:expat
-PKG_VERSION:=2.4.7
+PKG_CPE_ID:=cpe:/a:libexpat:libexpat
+PKG_VERSION:=2.6.2
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_HASH:=e149bdd8b90254c62b3d195da53a09bd531a4d63a963b0d8a5268d48dd2f6a65
+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
-include $(INCLUDE_DIR)/cmake.mk
-
-CMAKE_HOST_OPTIONS += \
-       -DDOCBOOK_TO_MAN=OFF \
-       -DEXPAT_BUILD_TOOLS=OFF \
-       -DEXPAT_BUILD_EXAMPLES=OFF \
-       -DEXPAT_BUILD_TESTS=OFF \
-       -DEXPAT_BUILD_DOCS=OFF \
-       -DEXPAT_WITH_LIBBSD=OFF \
-       -DEXPAT_ENABLE_INSTALL=ON \
-       -DEXPAT_DTD=ON \
-       -DEXPAT_NS=OFF \
-       -DEXPAT_DEV_URANDOM=OFF
+
+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))