From 94a84d3387615e17c51efbc0a8356ba641322ede Mon Sep 17 00:00:00 2001 From: Yorgos Thessalonikefs Date: Wed, 26 Mar 2025 16:40:10 +0100 Subject: [PATCH] - For #1255, for ios disable building tests that require C++11. --- contrib/ios/install_expat.sh | 7 ++++--- doc/Changelog | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/contrib/ios/install_expat.sh b/contrib/ios/install_expat.sh index 3219558df..915279f40 100755 --- a/contrib/ios/install_expat.sh +++ b/contrib/ios/install_expat.sh @@ -23,9 +23,10 @@ cd $LIBEXPAT_FNAME || exit 1 export PKG_CONFIG_PATH="$IOS_PREFIX/lib/pkgconfig" echo "Configuring Expat" -if ! ./configure \ - --build="$AUTOTOOLS_BUILD" --host="$AUTOTOOLS_HOST" \ - --prefix="$IOS_PREFIX" ; then +if ! ./configure --without-tests \ + --build="$AUTOTOOLS_BUILD" --host="$AUTOTOOLS_HOST" \ + --prefix="$IOS_PREFIX" ; +then echo "Error: Failed to configure Expat" cat config.log exit 1 diff --git a/doc/Changelog b/doc/Changelog index d90263a36..75257de94 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -2,6 +2,7 @@ - Fix #1255: Multiple pinnings to vulnerable copies of libexpat. - For #1255, for ios use an older expat version that does not require C++11 language features. + - For #1255, for ios disable building tests that require C++11. 24 March 2025: Wouter - Fix #1254: `send failed: Socket is not connected` and -- 2.47.3