diff --git a/contrib/depends/packages/expat.mk b/contrib/depends/packages/expat.mk deleted file mode 100644 index 59024517904..00000000000 --- a/contrib/depends/packages/expat.mk +++ /dev/null @@ -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 - diff --git a/contrib/depends/packages/packages.mk b/contrib/depends/packages/packages.mk index a5352cfe0bf..85c454dfb25 100644 --- a/contrib/depends/packages/packages.mk +++ b/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 diff --git a/contrib/depends/packages/unbound.mk b/contrib/depends/packages/unbound.mk index 435860b4876..3f3bfe3ca03 100644 --- a/contrib/depends/packages/unbound.mk +++ b/contrib/depends/packages/unbound.mk @@ -1,14 +1,14 @@ package=unbound -$(package)_version=1.19.1 +$(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=bc1d576f3dd846a0739adc41ffaa702404c6767d2b6082deb9f2f97cbb24a3a9 -$(package)_dependencies=openssl expat - +$(package)_sha256_hash=c5dd1bdef5d5685b2cedb749158dd152c52d44f65529a34ac15cd88d4b1b3d43 +$(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) @@ -17,6 +17,13 @@ define $(package)_set_vars $(package)_cflags_mingw32+="-D_WIN32_WINNT=0x600" 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 + define $(package)_config_cmds $($(package)_autoconf) ac_cv_func_getentropy=no AR_FLAGS=$($(package)_arflags) endef @@ -28,3 +35,7 @@ endef define $(package)_stage_cmds $(MAKE) DESTDIR=$($(package)_staging_dir) install endef + +define $(package)_postprocess_cmds + rm -rf share +endef diff --git a/contrib/depends/patches/unbound/no-expat.patch b/contrib/depends/patches/unbound/no-expat.patch new file mode 100644 index 00000000000..e43496b6d91 --- /dev/null +++ b/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)