tools/flex: override SUBDIRS variable with Makefile

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

diff --git a/tools/expat/Makefile b/tools/expat/Makefile
index fd4d2065a18f66ca34d16c976a1c2faa406423f2..c1a8cb8d97927fa50ba4080de5705271c1248405 100644 (file)
--- a/tools/expat/Makefile
+++ b/tools/expat/Makefile
@@ -9,18 +9,25 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=expat
 PKG_CPE_ID:=cpe:/a:libexpat:expat
-PKG_VERSION:=2.2.4
+PKG_VERSION:=2.5.0
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_HASH:=03ad85db965f8ab2d27328abcf0bc5571af6ec0a414874b2066ee3fdd372019e
-PKG_SOURCE_URL:=@SF/expat
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_HASH:=ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe
+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 \
+       --with-pic
+
+define Host/Uninstall
+       -$(call Host/Compile/Default,uninstall)
 endef
 
 $(eval $(call HostBuild))