From: Sascha Steinbiss <satta@debian.org>
Date: Wed, 1 Jun 2022 09:33:06 +0000 (+0100)
Subject: handle undefined LEVEL1_DCACHE_LINESIZE
X-Git-Tag: archive/raspbian/1%6.0.5-3+rpi1^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5f8f94dae46c74413d0433af5fa50afe1f5a4f0d;p=suricata.git

handle undefined LEVEL1_DCACHE_LINESIZE

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
---

diff --git a/configure.ac b/configure.ac
index 51306c76..e0958b7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2447,7 +2447,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])