Skip to content

Commit

Permalink
depends: remove expat
Browse files Browse the repository at this point in the history
  • Loading branch information
tobtoht committed Jan 4, 2025
1 parent e6aca48 commit 50e794f
Show file tree
Hide file tree
Showing 4 changed files with 67 additions and 33 deletions.
28 changes: 0 additions & 28 deletions contrib/depends/packages/expat.mk

This file was deleted.

2 changes: 1 addition & 1 deletion contrib/depends/packages/packages.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
packages:=boost openssl zeromq expat unbound sodium
packages:=boost openssl zeromq unbound sodium

hardware_packages := hidapi protobuf libusb
hardware_native_packages := native_protobuf
Expand Down
8 changes: 4 additions & 4 deletions contrib/depends/packages/unbound.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ $(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)_patches=disable-glibc-reallocarray.patch
$(package)_dependencies=openssl
$(package)_patches=disable-glibc-reallocarray.patch no-expat.patch

define $(package)_set_vars
$(package)_config_opts=--disable-shared --enable-static --without-pyunbound --prefix=$(host_prefix)
Expand All @@ -20,9 +20,9 @@ endef
# Remove blobs
define $(package)_preprocess_cmds
patch -p1 < $($(package)_patch_dir)/disable-glibc-reallocarray.patch &&\
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 &&\
autoconf
rm -rf testdata dnscrypt/testdata
endef

define $(package)_config_cmds
Expand Down
62 changes: 62 additions & 0 deletions contrib/depends/patches/unbound/no-expat.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
expat is used for an optional unbound-anchor app, which we don't use.

diff --git a/configure b/configure
index 918a063..0e35b2c 100755
--- a/configure
+++ b/configure
@@ -22042,55 +22042,6 @@ printf "%s\n" "#define USE_MINI_EVENT 1" >>confdefs.h

fi

-# check for libexpat
-
-# Check whether --with-libexpat was given.
-if test ${with_libexpat+y}
-then :
- withval=$with_libexpat;
-else $as_nop
- withval="/usr/local /opt/local /usr/lib /usr/pkg /usr/sfw /usr"
-fi
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libexpat" >&5
-printf %s "checking for libexpat... " >&6; }
-found_libexpat="no"
-for dir in $withval ; do
- if test -f "$dir/include/expat.h"; then
- found_libexpat="yes"
- if test "$dir" != "/usr"; then
- CPPFLAGS="$CPPFLAGS -I$dir/include"
- LDFLAGS="$LDFLAGS -L$dir/lib"
- fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found in $dir" >&5
-printf "%s\n" "found in $dir" >&6; }
- break;
- fi
-done
-if test x_$found_libexpat != x_yes; then
- as_fn_error $? "Could not find libexpat, expat.h" "$LINENO" 5
-fi
-ac_fn_c_check_header_compile "$LINENO" "expat.h" "ac_cv_header_expat_h" "$ac_includes_default
-"
-if test "x$ac_cv_header_expat_h" = xyes
-then :
- printf "%s\n" "#define HAVE_EXPAT_H 1" >>confdefs.h
-
-fi
-
-ac_fn_check_decl "$LINENO" "XML_StopParser" "ac_cv_have_decl_XML_StopParser" "$ac_includes_default
-#include <expat.h>
-
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
-if test "x$ac_cv_have_decl_XML_StopParser" = xyes
-then :
- ac_have_decl=1
-else $as_nop
- ac_have_decl=0
-fi
-printf "%s\n" "#define HAVE_DECL_XML_STOPPARSER $ac_have_decl" >>confdefs.h
-
-
# hiredis (redis C client for cachedb)

# Check whether --with-libhiredis was given.

0 comments on commit 50e794f

Please sign in to comment.