development/Catch2: Updated for version 3.5.3.

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

development/Catch2/Catch2.SlackBuild

@@ -2,7 +2,7 @@
 
 # Slackware build script for Catch2
 
-# Copyright 2023 Steven Voges <Oregon, USA>
+# Copyright 2023-2024 Steven Voges <Oregon, USA>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=Catch2
-VERSION=${VERSION:-3.4.0}
+VERSION=${VERSION:-3.5.3}
 DOCS=${DOCS:-OFF}
 EXTRAS=${EXTRAS:-ON}
 BUILD=${BUILD:-1}
@@ -63,6 +63,14 @@ else
   LIBDIRSUFFIX=""
 fi
 
+#Test for multilib
+COMPAT32=${COMPAT32@L}
+COMPATTMP="$( mktemp -d $TMP/compat32-test-XXXXXX )"
+echo "int main(void) {; return(0); }" > "$COMPATTMP/test.c"
+gcc -m32 "$COMPATTMP/test.c" -o /dev/null >/dev/null 2>&1 \
+  && COMPAT32=${COMPAT32:-yes}
+rm -rf "$COMPATTMP"
+
 set -e
 
 rm -rf $PKG
@@ -83,6 +91,7 @@ cd build
   cmake \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \
     -DCATCH_INSTALL_DOCS=$DOCS \
     -DCATCH_INSTALL_EXTRAS=$EXTRAS \
     -DCMAKE_BUILD_TYPE=Release ..
@@ -90,6 +99,22 @@ cd build
   make install/strip DESTDIR=$PKG
 cd ..
 
+if [ "$COMPAT32" = "yes" ]; then
+  mkdir -p build32
+  cd build32
+    cmake \
+      -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -m32" \
+      -DCMAKE_SHARED_LINKER_FLAGS:STRING="-m32" \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_INSTALL_LIBDIR=lib \
+      -DCATCH_INSTALL_DOCS=$DOCS \
+      -DCATCH_INSTALL_EXTRAS=$EXTRAS \
+      -DCMAKE_BUILD_TYPE=Release ..
+    make
+    make install/strip DESTDIR=$PKG
+  cd ..
+fi
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 

development/Catch2/Catch2.info

@@ -1,8 +1,8 @@
 PRGNAM="Catch2"
-VERSION="3.4.0"
+VERSION="3.5.3"
 HOMEPAGE="https://github.com/catchorg/Catch2"
-DOWNLOAD="https://github.com/catchorg/Catch2/archive/v3.4.0/Catch2-3.4.0.tar.gz"
-MD5SUM="2c802a4938ed842e2942c60d1d231bb7"
+DOWNLOAD="https://github.com/catchorg/Catch2/archive/v3.5.3/Catch2-3.5.3.tar.gz"
+MD5SUM="1f51d817ce81d54b12e87d06e159305f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""