[Scummvm-git-logs] scummvm master -> 091997056066c5e3ab9c8f5e64a9b018f130d27d

dwatteau noreply at scummvm.org
Wed Oct 30 21:01:35 UTC 2024


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0919970560 CONFIGURE: Fix syntax errors with some shells in the SSE2/AVX2/NEON checks


Commit: 091997056066c5e3ab9c8f5e64a9b018f130d27d
    https://github.com/scummvm/scummvm/commit/091997056066c5e3ab9c8f5e64a9b018f130d27d
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-10-30T21:59:49+01:00

Commit Message:
CONFIGURE: Fix syntax errors with some shells in the SSE2/AVX2/NEON checks

Fixes the script on OpenBSD's /bin/sh and the following shellcheck errors:

SC1035 (error): You are missing a required space after the !.
SC1105 (error): Shells disambiguate (( differently or not at all. For
                subshell, add spaces around ( . For ((, fix parsing errors.

The second error was fixed by removing the pair of parentheses, which were
just cosmetic and not required in this case.

Changed paths:
    configure


diff --git a/configure b/configure
index 9347246f111..77011568651 100755
--- a/configure
+++ b/configure
@@ -7032,8 +7032,8 @@ case $_host_cpu in
 		fi
 		_ext_neon=no
 		# SSE2 is always available on x86_64
-		if !(test "$have_clang" = yes && ((test $_clang_major -gt 5) || (test $_clang_major -eq 5 && test $_clang_minor -gt 0))) &&
-		   !(test "$have_gcc"   = yes && ((test $_cxx_major   -gt 4) || (test $_cxx_major   -eq 4 && test $_cxx_minor   -gt 9))); then
+		if ! (test "$have_clang" = yes && (test $_clang_major -gt 5 || (test $_clang_major -eq 5 && test $_clang_minor -gt 0))) &&
+		   ! (test "$have_gcc"   = yes && (test $_cxx_major   -gt 4 || (test $_cxx_major   -eq 4 && test $_cxx_minor   -gt 9))); then
 			# Need GCC 4.9+ or Clang 5.0+ for target pragma
 			_ext_avx2=no
 		fi
@@ -7046,8 +7046,8 @@ case $_host_cpu in
 			_ext_avx2=no
 		fi
 		_ext_neon=no
-		if !(test "$have_clang" = yes && ((test $_clang_major -gt 5) || (test $_clang_major -eq 5 && test $_clang_minor -gt 0))) &&
-		   !(test "$have_gcc"   = yes && ((test $_cxx_major   -gt 4) || (test $_cxx_major   -eq 4 && test $_cxx_minor   -gt 9))); then
+		if ! (test "$have_clang" = yes && (test $_clang_major -gt 5 || (test $_clang_major -eq 5 && test $_clang_minor -gt 0))) &&
+		   ! (test "$have_gcc"   = yes && (test $_cxx_major   -gt 4 || (test $_cxx_major   -eq 4 && test $_cxx_minor   -gt 9))); then
 			# Need GCC 4.9+ or Clang 5.0+ for target pragma
 			_ext_sse2=no
 			_ext_avx2=no
@@ -7067,8 +7067,8 @@ case $_host_cpu in
 		fi
 		_ext_sse2=no
 		_ext_avx2=no
-		if !(test "$have_clang" = yes && ((test $_clang_major -gt 19) || (test $_clang_major -eq 19 && test $_clang_minor -gt 1))) &&
-		   !(test "$have_gcc"   = yes && ((test $_cxx_major   -gt  4) || (test $_cxx_major   -eq  4 && test $_cxx_minor   -gt 9))); then
+		if ! (test "$have_clang" = yes && (test $_clang_major -gt 19 || (test $_clang_major -eq 19 && test $_clang_minor -gt 1))) &&
+		   ! (test "$have_gcc"   = yes && (test $_cxx_major   -gt  4 || (test $_cxx_major   -eq  4 && test $_cxx_minor   -gt 9))); then
 			# Need GCC 4.9+ or Clang 19.1+ for target pragma
 			_ext_neon=no
 		fi




More information about the Scummvm-git-logs mailing list