Miroirs/slackbuilds_ponce
1
0
Fork 0
mirror of https://github.com/Ponce/slackbuilds synced 2024-09-29 17:37:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

development/Catch2: Fix multilib check.

Browse source 
Check if the multilib flag is not explicitly set. Otherwise we
overwrite whatever was passed in through the env.

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

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
Andrew Clemons 2024-04-13 13:04:33 +09:00 committed by Willy Sudiarto Raharjo
parent 19fc7bf6ce
commit 807ff51345
No known key found for this signature in database
GPG key ID: 3F617144D7238786
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
development/Catch2/Catch2.SlackBuild
View file

@ -65,11 +65,13 @@ 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"
if [ "$COMPAT32" = "" ] ; then
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"
fi
set -e