diod: fix build with lua 5.5 and gcc 15

Bump the lua max-version check from 5.5 to 5.6 in the pkg-config
patch to allow lua 5.5.0 from OE-core.

Add -Wno-error=discarded-qualifiers to CFLAGS to work around gcc 15
being stricter about const qualifiers in strchr return values. The
upstream code uses -Werror which makes this fatal.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

2 files changed, 9 insertions, 6 deletions

diff --git a/recipes-extended/diod/diod_git.bb b/recipes-extended/diod/diod_git.bb
index bc878cb5..0e2043ec 100644
--- a/recipes-extended/diod/diod_git.bb
+++ b/recipes-extended/diod/diod_git.bb
@@ -20,6 +20,9 @@ DEPENDS = "libcap ncurses lua"
 EXTRA_OECONF = "--disable-auth \
                 --with-systemdsystemunitdir=${systemd_unitdir}/system"
 
+# GCC 15 is stricter about const qualifiers; upstream uses -Werror
+CFLAGS += "-Wno-error=discarded-qualifiers"
+
 inherit autotools pkgconfig systemd
 
 do_install:append () {
diff --git a/recipes-extended/diod/files/0001-build-Find-lua-with-pkg-config.patch b/recipes-extended/diod/files/0001-build-Find-lua-with-pkg-config.patch
index 9f61792a..0f4049b6 100644
--- a/recipes-extended/diod/files/0001-build-Find-lua-with-pkg-config.patch
+++ b/recipes-extended/diod/files/0001-build-Find-lua-with-pkg-config.patch
@@ -11,11 +11,11 @@ Upstream-Status: Inappropriate (Embedded specific)
  configure.ac | 26 +++++++++++++++++++++++++-
  1 file changed, 25 insertions(+), 1 deletion(-)
 
-diff --git a/configure.ac b/configure.ac
-index e8fcdb2..f3ebdc5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -121,7 +121,31 @@ AC_ARG_ENABLE([config],
+Index: diod-1.1.0+git/configure.ac
+===================================================================
+--- diod-1.1.0+git.orig/configure.ac
++++ diod-1.1.0+git/configure.ac
+@@ -138,7 +138,31 @@ AC_ARG_ENABLE([config],
    [AS_HELP_STRING([--disable-config], [disable lua config file support])])
  
  AS_IF([test "x$enable_config" != "xno"], [
@@ -27,7 +27,7 @@ index e8fcdb2..f3ebdc5 100644
 +  dnl AX_LUA_LIBS are still usable.
 +  PKG_CHECK_EXISTS([lua], [
 +    AS_IF([
-+      $PKG_CONFIG --atleast-version=5.1 lua && $PKG_CONFIG --max-version=5.5 lua
++      $PKG_CONFIG --atleast-version=5.1 lua && $PKG_CONFIG --max-version=5.6 lua
 +    ],[
 +      AC_ARG_VAR([LUA], [The LUA interpreter, e.g. /usr/bin/lua5.1])
 +         dnl should really check that the file exists ...