- For #1255, for ios disable building tests that require C++11.

diff --git a/contrib/ios/install_expat.sh b/contrib/ios/install_expat.sh
index 3219558dfa02f7828423e5f3c07758746abba837..915279f4086b89e117c41e4eada6a75311b421f6 100755 (executable)
--- 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 d90263a364ee323a162aff4d2f1ffa7fedec6b0f..75257de948b5fec3484528c6ce3e63927841bcaf 100644 (file)
--- 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