diff options
| author | Steven Voges <svoges.sbo@gmail.com> | 2024-04-12 22:53:27 +0900 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2024-04-13 22:03:57 +0700 |
| commit | 19fc7bf6ceef79bc77baaf1da801d3c17019b836 (patch) | |
| tree | ab159c1ba161fee1a5a0d23521f1720ce8f40db8 /development | |
| parent | b90e0d0df71005beebdce88696c49ee26bf5f004 (diff) | |
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>
Diffstat (limited to 'development')
| -rw-r--r-- | development/Catch2/Catch2.SlackBuild | 29 | ||||
| -rw-r--r-- | development/Catch2/Catch2.info | 6 |
2 files changed, 30 insertions, 5 deletions
diff --git a/development/Catch2/Catch2.SlackBuild b/development/Catch2/Catch2.SlackBuild index 5513ed6deee0..1b0dbedc52c9 100644 --- a/development/Catch2/Catch2.SlackBuild +++ b/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 diff --git a/development/Catch2/Catch2.info b/development/Catch2/Catch2.info index 906fed823c9d..4c41cb14db51 100644 --- a/development/Catch2/Catch2.info +++ b/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="" |