depends: remove expat

contrib/depends/packages/expat.mk

@@ -1,28 +0,0 @@
-package=expat
-$(package)_version=2.6.0
-$(package)_download_path=https://github.com/libexpat/libexpat/releases/download/R_$(subst .,_,$($(package)_version))/
-$(package)_file_name=$(package)-$($(package)_version).tar.bz2
-$(package)_sha256_hash=ff60e6a6b6ce570ae012dc7b73169c7fdf4b6bf08c12ed0ec6f55736b78d85ba
-
-define $(package)_set_vars
-$(package)_config_opts=--disable-shared --without-docbook --without-tests --without-examples
-$(package)_config_opts+=--enable-option-checking --without-xmlwf --with-pic
-$(package)_config_opts+=--prefix=$(host_prefix)
-endef
-
-define $(package)_config_cmds
-  $($(package)_autoconf)
-endef
-
-define $(package)_build_cmds
-  $(MAKE)
-endef
-
-define $(package)_stage_cmds
-  $(MAKE) DESTDIR=$($(package)_staging_dir) install
-endef
-
-define $(package)_postprocess_cmds
-  rm -rf share lib/cmake lib/*.la
-endef
-

contrib/depends/packages/packages.mk

@@ -1,5 +1,5 @@
 native_packages := native_protobuf
-packages := boost openssl zeromq expat unbound sodium protobuf
+packages := boost openssl zeromq unbound sodium protobuf
 
 ifneq ($(host_os),android)
 packages += libusb

contrib/depends/packages/unbound.mk

@@ -3,11 +3,12 @@ $(package)_version=1.22.0
 $(package)_download_path=https://www.nlnetlabs.nl/downloads/$(package)/
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
 $(package)_sha256_hash=c5dd1bdef5d5685b2cedb749158dd152c52d44f65529a34ac15cd88d4b1b3d43
-$(package)_dependencies=openssl expat
+$(package)_dependencies=openssl
+$(package)_patches=no-expat.patch
 
 define $(package)_set_vars
   $(package)_config_opts=--disable-shared --enable-static --without-pyunbound --prefix=$(host_prefix)
-  $(package)_config_opts+=--with-libexpat=$(host_prefix) --with-ssl=$(host_prefix) --with-libevent=no
+  $(package)_config_opts+=--with-libexpat=no --with-ssl=$(host_prefix) --with-libevent=no
   $(package)_config_opts+=--without-pythonmodule --disable-flto --with-pthreads --with-libunbound-only
   $(package)_config_opts_linux=--with-pic
   $(package)_config_opts_w64=--enable-static-exe --sysconfdir=/etc --prefix=$(host_prefix) --target=$(host_prefix)
@@ -18,6 +19,7 @@ endef
 
 # Remove blobs
 define $(package)_preprocess_cmds
+  patch -p1 < $($(package)_patch_dir)/no-expat.patch &&\
   rm configure~ doc/*.odp doc/*.pdf contrib/*.tar.gz contrib/*.tar.bz2 &&\
   rm -rf testdata dnscrypt/testdata
 endef

contrib/depends/patches/unbound/no-expat.patch

@@ -0,0 +1,21 @@
+expat is used for an optional unbound-anchor app, which we don't use.
+diff --git a/configure b/configure
+index a41e3e1e..e909dc4e 100755
+--- a/configure
++++ b/configure
+@@ -22056,6 +22056,7 @@ fi
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libexpat" >&5
+ printf %s "checking for libexpat... " >&6; }
+ found_libexpat="no"
++if test x_$withval = x_yes -o x_$withval != x_no; then
+ for dir in $withval ; do
+             if test -f "$dir/include/expat.h"; then
+ 		found_libexpat="yes"
+@@ -22090,6 +22091,7 @@ else $as_nop
+   ac_have_decl=0
+ fi
+ printf "%s\n" "#define HAVE_DECL_XML_STOPPARSER $ac_have_decl" >>confdefs.h
++fi
+ 
+ 
+ # hiredis (redis C client for cachedb)