diff --git a/system/base/kmod/actions.py b/system/base/kmod/actions.py index 8013e5e6..0240a451 100644 --- a/system/base/kmod/actions.py +++ b/system/base/kmod/actions.py @@ -16,10 +16,11 @@ def setup(): if get.buildTYPE() == "emul32": options += " --bindir=/usr/emul32 \ + --with-rootlibdir=/lib32 \ --libdir=/usr/lib32" if get.buildTYPE() != "emul32": - options += " --with-zstd" + options += " --with-zstd --with-rootlibdir=/lib" autotools.configure(options) diff --git a/system/base/kmod/files/kmod-configure-c99.patch b/system/base/kmod/files/kmod-configure-c99.patch new file mode 100644 index 00000000..86cda4d7 --- /dev/null +++ b/system/base/kmod/files/kmod-configure-c99.patch @@ -0,0 +1,37 @@ +configure.ac: In _Noreturn check, include for exit + +Otherwise, an implicit functiona declaration is used, causing +a C99 compatibility issue. + +Submitted upstream: + + + +diff --git a/configure b/configure +index d053310a8b4a313a..ec1f12d02428f848 100755 +--- a/configure ++++ b/configure +@@ -14021,7 +14021,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + printf %s "checking whether _Noreturn is supported... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-_Noreturn int foo(void) { exit(0); } ++#include ++ _Noreturn int foo(void) { exit(0); } + _ACEOF + if ac_fn_c_try_compile "$LINENO" + then : +diff --git a/configure.ac b/configure.ac +index 6989e9360da23721..12e0518533201ccf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -68,7 +68,8 @@ AC_COMPILE_IFELSE( + + AC_MSG_CHECKING([whether _Noreturn is supported]) + AC_COMPILE_IFELSE( +- [AC_LANG_SOURCE([[_Noreturn int foo(void) { exit(0); }]])], ++ [AC_LANG_SOURCE([[#include ++ _Noreturn int foo(void) { exit(0); }]])], + [AC_DEFINE([HAVE_NORETURN], [1], [Define if _Noreturn is available]) + AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no])]) diff --git a/system/base/kmod/pspec.xml b/system/base/kmod/pspec.xml index 81c8cb2b..4b9f6045 100644 --- a/system/base/kmod/pspec.xml +++ b/system/base/kmod/pspec.xml @@ -22,7 +22,7 @@ kernel-module-headers - kmod-15-dynamic-kmod.patch + kmod-configure-c99.patch @@ -87,6 +87,7 @@ kmod libraries /usr/lib + /lib @@ -104,11 +105,19 @@ zlib-32bit + /lib32 /usr/lib32 + + 2023-01-14 + 30 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2022-06-30 30