handle undefined LEVEL1_DCACHE_LINESIZE
authorSascha Steinbiss <satta@debian.org>
Wed, 21 Sep 2022 16:39:53 +0000 (17:39 +0100)
committerSascha Steinbiss <satta@debian.org>
Wed, 21 Sep 2022 16:39:53 +0000 (17:39 +0100)
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 fe64dfb57a244ed65e3e7c6aecf42b3607957f6a..4962297a6fc4346525ed279aa782180c655bc825 100644 (file)
@@ -2448,7 +2448,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])