handle undefined LEVEL1_DCACHE_LINESIZE
authorSascha Steinbiss <satta@debian.org>
Tue, 29 Nov 2022 10:19:06 +0000 (10:19 +0000)
committerSascha Steinbiss <satta@debian.org>
Tue, 29 Nov 2022 10:19:06 +0000 (10:19 +0000)
Applied-Upstream: https://github.com/OISF/suricata/pull/7350
Last-Update: 2022-06-01

On some platforms (riscv64, s390x) this value is undefined as returned from getconf.
We also need to handle this to avoid using the string undefined blindly in further
#defines, which would otherwise cause compile errors.

Gbp-Pq: Name LEVEL1_DCACHE_LINESIZE.patch

configure.ac

index 468581b49f78ee2e24f82e91938482f6a3173787..40b221235185fda3c82b19883cb80cd841892fd1 100644 (file)
@@ -2436,7 +2436,7 @@ fi
     AC_PATH_PROG(HAVE_GETCONF_CMD, getconf, "no")
     if test "$HAVE_GETCONF_CMD" != "no"; then
         CLS=$(getconf LEVEL1_DCACHE_LINESIZE)
-        if [test "$CLS" != "" && test "$CLS" != "0"]; then
+        if [test "$CLS" != "undefined" && "$CLS" != "" && test "$CLS" != "0"]; then
             AC_DEFINE_UNQUOTED([CLS],[${CLS}],[L1 cache line size])
         else
             AC_DEFINE([CLS],[64],[L1 cache line size])