From cafc75fc8ae4d747b7a8089ecfbf4875b1c17e39 Mon Sep 17 00:00:00 2001
From: Guido Vranken <guidovranken@users.noreply.github.com>
Date: Mon, 10 Apr 2023 12:20:31 +0200
Subject: [PATCH] Fix Botan build in multiple projects (#10050)

---
 projects/bls-signatures/build.sh | 4 ++--
 projects/libecc/build.sh         | 4 ++--
 projects/libressl/build.sh       | 4 ++--
 projects/num-bigint/build.sh     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/projects/bls-signatures/build.sh b/projects/bls-signatures/build.sh
index 5b7bcdf49..45992d20a 100755
--- a/projects/bls-signatures/build.sh
+++ b/projects/bls-signatures/build.sh
@@ -197,7 +197,7 @@ then
     ./configure.py --cc-bin=$CXX \
     --cc-abi-flags="$CXXFLAGS" \
     --disable-shared \
-    --disable-modules=locking_allocator,x509,tls \
+    --disable-modules=locking_allocator,x509 \
     --build-targets=static \
     --without-documentation
 else
@@ -205,7 +205,7 @@ else
     --cc-bin=$CXX \
     --cc-abi-flags="$CXXFLAGS" \
     --disable-shared \
-    --disable-modules=locking_allocator,x509,tls \
+    --disable-modules=locking_allocator,x509 \
     --build-targets=static \
     --without-documentation
 fi
diff --git a/projects/libecc/build.sh b/projects/libecc/build.sh
index cf594fa83..8ab6e3677 100755
--- a/projects/libecc/build.sh
+++ b/projects/libecc/build.sh
@@ -37,9 +37,9 @@ export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_LIBECC"
 cd $SRC/botan
 if [[ $CFLAGS != *-m32* ]]
 then
-    ./configure.py --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator,x509,tls --build-targets=static --without-documentation
+    ./configure.py --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator,x509 --build-targets=static --without-documentation
 else
-    ./configure.py --cpu=x86_32 --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator,x509,tls --build-targets=static --without-documentation
+    ./configure.py --cpu=x86_32 --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator,x509 --build-targets=static --without-documentation
 fi
 make -j$(nproc)
 
diff --git a/projects/libressl/build.sh b/projects/libressl/build.sh
index 01b33e160..58f7e4e51 100755
--- a/projects/libressl/build.sh
+++ b/projects/libressl/build.sh
@@ -80,9 +80,9 @@ fi
 cd $SRC/botan
 if [[ $CFLAGS != *-m32* ]]
 then
-    ./configure.py --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator,x509,tls --build-targets=static --without-documentation
+    ./configure.py --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator,x509 --build-targets=static --without-documentation
 else
-    ./configure.py --cpu=x86_32 --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator,x509,tls --build-targets=static --without-documentation
+    ./configure.py --cpu=x86_32 --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator,x509 --build-targets=static --without-documentation
 fi
 make -j$(nproc)
 
diff --git a/projects/num-bigint/build.sh b/projects/num-bigint/build.sh
index 89a1f3db2..f7b7fa82f 100755
--- a/projects/num-bigint/build.sh
+++ b/projects/num-bigint/build.sh
@@ -44,9 +44,9 @@ echo -n '"' >>extra_options.h
 cd $SRC/botan
 if [[ $CFLAGS != *-m32* ]]
 then
-    ./configure.py --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator,x509,tls --build-targets=static --without-documentation
+    ./configure.py --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator,x509 --build-targets=static --without-documentation
 else
-    ./configure.py --cpu=x86_32 --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator,x509,tls --build-targets=static --without-documentation
+    ./configure.py --cpu=x86_32 --cc-bin=$CXX --cc-abi-flags="$CXXFLAGS" --disable-shared --disable-modules=locking_allocator,x509 --build-targets=static --without-documentation
 fi
 make -j$(nproc)
 export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_BOTAN -DCRYPTOFUZZ_BOTAN_IS_ORACLE"