From: Markus Volk Date: Sat, 2 Aug 2025 09:28:50 +0000 (+0200) Subject: autoconf-archive: add backport patches to fix gl and glx detection X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=a1dce757f95fd13d80593bb6227315aacd29f5aa;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git autoconf-archive: add backport patches to fix gl and glx detection Detecting opengl using autoconf-archive currently fails: | aclocal: warning: couldn't open directory 'm4': No such file or directory | configure.ac:306: error: _AX_CHECK_GL_MANUAL_LIBS_GENERIC: argument must not be empty | ../sources/autoconf-2.72/lib/m4sugar/m4sh.m4:690: _AS_IF_ELSE is expanded from... | ../sources/autoconf-2.72/lib/m4sugar/m4sh.m4:697: AS_IF is expanded from... | /home/flk/poky/build/tmp/work/corei7-64-poky-linux/cava/0.10.4/recipe-sysroot-native/usr/share/aclocal/ax_check_gl.m4:187: _AX_CHECK_GL_MANUAL_LIBS_GENERIC is expanded from... | ../sources/autoconf-2.72/lib/m4sugar/m4sh.m4:595: AS_CASE is expanded from... | /home/flk/poky/build/tmp/work/corei7-64-poky-linux/cava/0.10.4/recipe-sysroot-native/usr/share/aclocal/ax_check_gl.m4:253: AX_CHECK_GL is expanded from... | ../sources/autoconf-2.72/lib/m4sugar/m4sh.m4:697: AS_IF is expanded from... | ../sources/autoconf-2.72/lib/m4sugar/m4sh.m4:697: AS_IF is expanded from... | configure.ac:306: the top level | autom4te: error: m4 failed with exit status: 1 This issue has already been fixed upstream, but there has been no new release since then. Signed-off-by: Markus Volk Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-devtools/autoconf-archive/autoconf-archive/3a23daa3da0eb1a256fda631867e19345d5f6e3a.patch b/meta/recipes-devtools/autoconf-archive/autoconf-archive/3a23daa3da0eb1a256fda631867e19345d5f6e3a.patch new file mode 100644 index 00000000000..64d73781d3e --- /dev/null +++ b/meta/recipes-devtools/autoconf-archive/autoconf-archive/3a23daa3da0eb1a256fda631867e19345d5f6e3a.patch @@ -0,0 +1,33 @@ +From 3a23daa3da0eb1a256fda631867e19345d5f6e3a Mon Sep 17 00:00:00 2001 +From: Eli Schwartz +Date: Sat, 19 Oct 2024 21:58:52 -0400 +Subject: [PATCH] ax_switch_flags.m4: properly quote m4_fatal + +It needs to only run as an argument of m4_if, not all the time. + +Fixes: 2adff78e224c908fd58df91852c8301c25777a8f + +Upstream-Status: Backport [https://github.com/autoconf-archive/autoconf-archive/commit/3a23daa3da0eb1a256fda631867e19345d5f6e3a] + +Signed-off-by: Markus Volk +--- + m4/ax_switch_flags.m4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/m4/ax_switch_flags.m4 b/m4/ax_switch_flags.m4 +index dc79d1e9..777aeb0b 100644 +--- a/m4/ax_switch_flags.m4 ++++ b/m4/ax_switch_flags.m4 +@@ -36,10 +36,10 @@ + # and this notice are preserved. This file is offered as-is, without any + # warranty. + +-#serial 5 ++#serial 6 + + AC_DEFUN([AX_SWITCH_FLAGS], [ +- m4_if($1, [], m4_fatal([$0: namespace is empty])) ++ m4_if($1, [], [m4_fatal([$0: namespace is empty])]) + AC_REQUIRE(AX_SAVE_FLAGS) + AC_REQUIRE(AX_RESTORE_FLAGS) + AX_SAVE_FLAGS($1[]) diff --git a/meta/recipes-devtools/autoconf-archive/autoconf-archive/427e226a2fe3980388abffd6de25ed6b9591cce3.patch b/meta/recipes-devtools/autoconf-archive/autoconf-archive/427e226a2fe3980388abffd6de25ed6b9591cce3.patch new file mode 100644 index 00000000000..8a86d0a4d89 --- /dev/null +++ b/meta/recipes-devtools/autoconf-archive/autoconf-archive/427e226a2fe3980388abffd6de25ed6b9591cce3.patch @@ -0,0 +1,39 @@ +From 427e226a2fe3980388abffd6de25ed6b9591cce3 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz +Date: Sat, 19 Oct 2024 21:51:30 -0400 +Subject: [PATCH] ax_check_gl.m4: properly quote m4_fatal + +It needs to only run as an argument of m4_if, not all the time. + +Fixes: 753493bf7e251997f02559b98fc599d4a337d8cd +Bug: https://bugs.gentoo.org/941845 + +Upstream-Status: Backport [https://github.com/autoconf-archive/autoconf-archive/commit/427e226a2fe3980388abffd6de25ed6b9591cce3] + +Signed-off-by: Markus Volk +--- + m4/ax_check_gl.m4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/m4/ax_check_gl.m4 b/m4/ax_check_gl.m4 +index 850d407d..4c2e4efb 100644 +--- a/m4/ax_check_gl.m4 ++++ b/m4/ax_check_gl.m4 +@@ -85,7 +85,7 @@ + # modified version of the Autoconf Macro, you may extend this special + # exception to the GPL to apply to your modified version as well. + +-#serial 23 ++#serial 24 + + # example gl program + m4_define([_AX_CHECK_GL_PROGRAM], +@@ -187,7 +187,7 @@ AC_DEFUN([_AX_CHECK_GL_LINK_CV], + AC_DEFUN([_AX_CHECK_GL_MANUAL_LIBS_GENERIC], [ + AS_IF([test -n "$GL_LIBS"],[], [ + ax_check_gl_manual_libs_generic_extra_libs="$1" +- m4_if($1, [], m4_fatal([$0: argument must not be empty])) ++ m4_if($1, [], [m4_fatal([$0: argument must not be empty])]) + + _AX_CHECK_GL_SAVE_FLAGS([CFLAGS]) + AC_SEARCH_LIBS([glBegin],[$ax_check_gl_manual_libs_generic_extra_libs], [ diff --git a/meta/recipes-devtools/autoconf-archive/autoconf-archive/e25f8d9e3ead52f998535b86c763065c5b45cc59.patch b/meta/recipes-devtools/autoconf-archive/autoconf-archive/e25f8d9e3ead52f998535b86c763065c5b45cc59.patch new file mode 100644 index 00000000000..9e2689010ff --- /dev/null +++ b/meta/recipes-devtools/autoconf-archive/autoconf-archive/e25f8d9e3ead52f998535b86c763065c5b45cc59.patch @@ -0,0 +1,38 @@ +From e25f8d9e3ead52f998535b86c763065c5b45cc59 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz +Date: Sat, 19 Oct 2024 21:57:16 -0400 +Subject: [PATCH] ax_check_glx.m4: properly quote m4_fatal + +It needs to only run as an argument of m4_if, not all the time. + +Fixes: 40ca66e7e52bb63e3eee2514855fcf3ad2df7673 + +Upstream-Status: Backport [https://github.com/autoconf-archive/autoconf-archive/commit/e25f8d9e3ead52f998535b86c763065c5b45cc59] + +Signed-off-by: Markus Volk +--- + m4/ax_check_glx.m4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/m4/ax_check_glx.m4 b/m4/ax_check_glx.m4 +index c7890d9c..b5027f9b 100644 +--- a/m4/ax_check_glx.m4 ++++ b/m4/ax_check_glx.m4 +@@ -61,7 +61,7 @@ + # modified version of the Autoconf Macro, you may extend this special + # exception to the GPL to apply to your modified version as well. + +-#serial 9 ++#serial 10 + + # example program + m4_define([_AX_CHECK_GLX_PROGRAM], +@@ -183,7 +183,7 @@ AC_DEFUN([_AX_CHECK_GLX_HEADERS], + AC_DEFUN([_AX_CHECK_GLX_MANUAL_LIBS_GENERIC], + [dnl + ax_check_glx_manual_libs_generic_extra_libs="$1" +- m4_if($1, [], m4_fatal([$0: argument must not be empty])) ++ m4_if($1, [], [m4_fatal([$0: argument must not be empty])]) + + AC_LANG_PUSH([C]) + _AX_CHECK_GLX_SAVE_FLAGS() diff --git a/meta/recipes-devtools/autoconf-archive/autoconf-archive_2024.10.16.bb b/meta/recipes-devtools/autoconf-archive/autoconf-archive_2024.10.16.bb index 11708de1c85..46d1b91d658 100644 --- a/meta/recipes-devtools/autoconf-archive/autoconf-archive_2024.10.16.bb +++ b/meta/recipes-devtools/autoconf-archive/autoconf-archive_2024.10.16.bb @@ -6,6 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=11cc2d3ee574f9d6b7ee797bdce4d423 \ file://COPYING.EXCEPTION;md5=fdef168ebff3bc2f13664c365a5fb515" SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz" +SRC_URI += "file://427e226a2fe3980388abffd6de25ed6b9591cce3.patch" +SRC_URI += "file://3a23daa3da0eb1a256fda631867e19345d5f6e3a.patch" +SRC_URI += "file://e25f8d9e3ead52f998535b86c763065c5b45cc59.patch" SRC_URI[sha256sum] = "7bcd5d001916f3a50ed7436f4f700e3d2b1bade3ed803219c592d62502a57363" inherit autotools allarch texinfo