diff options
4 files changed, 113 insertions, 0 deletions
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 0000000000..64d73781d3 --- /dev/null +++ b/meta/recipes-devtools/autoconf-archive/autoconf-archive/3a23daa3da0eb1a256fda631867e19345d5f6e3a.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 3a23daa3da0eb1a256fda631867e19345d5f6e3a Mon Sep 17 00:00:00 2001 | ||
2 | From: Eli Schwartz <eschwartz93@gmail.com> | ||
3 | Date: Sat, 19 Oct 2024 21:58:52 -0400 | ||
4 | Subject: [PATCH] ax_switch_flags.m4: properly quote m4_fatal | ||
5 | |||
6 | It needs to only run as an argument of m4_if, not all the time. | ||
7 | |||
8 | Fixes: 2adff78e224c908fd58df91852c8301c25777a8f | ||
9 | |||
10 | Upstream-Status: Backport [https://github.com/autoconf-archive/autoconf-archive/commit/3a23daa3da0eb1a256fda631867e19345d5f6e3a] | ||
11 | |||
12 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
13 | --- | ||
14 | m4/ax_switch_flags.m4 | 4 ++-- | ||
15 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/m4/ax_switch_flags.m4 b/m4/ax_switch_flags.m4 | ||
18 | index dc79d1e9..777aeb0b 100644 | ||
19 | --- a/m4/ax_switch_flags.m4 | ||
20 | +++ b/m4/ax_switch_flags.m4 | ||
21 | @@ -36,10 +36,10 @@ | ||
22 | # and this notice are preserved. This file is offered as-is, without any | ||
23 | # warranty. | ||
24 | |||
25 | -#serial 5 | ||
26 | +#serial 6 | ||
27 | |||
28 | AC_DEFUN([AX_SWITCH_FLAGS], [ | ||
29 | - m4_if($1, [], m4_fatal([$0: namespace is empty])) | ||
30 | + m4_if($1, [], [m4_fatal([$0: namespace is empty])]) | ||
31 | AC_REQUIRE(AX_SAVE_FLAGS) | ||
32 | AC_REQUIRE(AX_RESTORE_FLAGS) | ||
33 | 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 0000000000..8a86d0a4d8 --- /dev/null +++ b/meta/recipes-devtools/autoconf-archive/autoconf-archive/427e226a2fe3980388abffd6de25ed6b9591cce3.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From 427e226a2fe3980388abffd6de25ed6b9591cce3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Eli Schwartz <eschwartz93@gmail.com> | ||
3 | Date: Sat, 19 Oct 2024 21:51:30 -0400 | ||
4 | Subject: [PATCH] ax_check_gl.m4: properly quote m4_fatal | ||
5 | |||
6 | It needs to only run as an argument of m4_if, not all the time. | ||
7 | |||
8 | Fixes: 753493bf7e251997f02559b98fc599d4a337d8cd | ||
9 | Bug: https://bugs.gentoo.org/941845 | ||
10 | |||
11 | Upstream-Status: Backport [https://github.com/autoconf-archive/autoconf-archive/commit/427e226a2fe3980388abffd6de25ed6b9591cce3] | ||
12 | |||
13 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
14 | --- | ||
15 | m4/ax_check_gl.m4 | 4 ++-- | ||
16 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
17 | |||
18 | diff --git a/m4/ax_check_gl.m4 b/m4/ax_check_gl.m4 | ||
19 | index 850d407d..4c2e4efb 100644 | ||
20 | --- a/m4/ax_check_gl.m4 | ||
21 | +++ b/m4/ax_check_gl.m4 | ||
22 | @@ -85,7 +85,7 @@ | ||
23 | # modified version of the Autoconf Macro, you may extend this special | ||
24 | # exception to the GPL to apply to your modified version as well. | ||
25 | |||
26 | -#serial 23 | ||
27 | +#serial 24 | ||
28 | |||
29 | # example gl program | ||
30 | m4_define([_AX_CHECK_GL_PROGRAM], | ||
31 | @@ -187,7 +187,7 @@ AC_DEFUN([_AX_CHECK_GL_LINK_CV], | ||
32 | AC_DEFUN([_AX_CHECK_GL_MANUAL_LIBS_GENERIC], [ | ||
33 | AS_IF([test -n "$GL_LIBS"],[], [ | ||
34 | ax_check_gl_manual_libs_generic_extra_libs="$1" | ||
35 | - m4_if($1, [], m4_fatal([$0: argument must not be empty])) | ||
36 | + m4_if($1, [], [m4_fatal([$0: argument must not be empty])]) | ||
37 | |||
38 | _AX_CHECK_GL_SAVE_FLAGS([CFLAGS]) | ||
39 | 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 0000000000..9e2689010f --- /dev/null +++ b/meta/recipes-devtools/autoconf-archive/autoconf-archive/e25f8d9e3ead52f998535b86c763065c5b45cc59.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From e25f8d9e3ead52f998535b86c763065c5b45cc59 Mon Sep 17 00:00:00 2001 | ||
2 | From: Eli Schwartz <eschwartz93@gmail.com> | ||
3 | Date: Sat, 19 Oct 2024 21:57:16 -0400 | ||
4 | Subject: [PATCH] ax_check_glx.m4: properly quote m4_fatal | ||
5 | |||
6 | It needs to only run as an argument of m4_if, not all the time. | ||
7 | |||
8 | Fixes: 40ca66e7e52bb63e3eee2514855fcf3ad2df7673 | ||
9 | |||
10 | Upstream-Status: Backport [https://github.com/autoconf-archive/autoconf-archive/commit/e25f8d9e3ead52f998535b86c763065c5b45cc59] | ||
11 | |||
12 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
13 | --- | ||
14 | m4/ax_check_glx.m4 | 4 ++-- | ||
15 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/m4/ax_check_glx.m4 b/m4/ax_check_glx.m4 | ||
18 | index c7890d9c..b5027f9b 100644 | ||
19 | --- a/m4/ax_check_glx.m4 | ||
20 | +++ b/m4/ax_check_glx.m4 | ||
21 | @@ -61,7 +61,7 @@ | ||
22 | # modified version of the Autoconf Macro, you may extend this special | ||
23 | # exception to the GPL to apply to your modified version as well. | ||
24 | |||
25 | -#serial 9 | ||
26 | +#serial 10 | ||
27 | |||
28 | # example program | ||
29 | m4_define([_AX_CHECK_GLX_PROGRAM], | ||
30 | @@ -183,7 +183,7 @@ AC_DEFUN([_AX_CHECK_GLX_HEADERS], | ||
31 | AC_DEFUN([_AX_CHECK_GLX_MANUAL_LIBS_GENERIC], | ||
32 | [dnl | ||
33 | ax_check_glx_manual_libs_generic_extra_libs="$1" | ||
34 | - m4_if($1, [], m4_fatal([$0: argument must not be empty])) | ||
35 | + m4_if($1, [], [m4_fatal([$0: argument must not be empty])]) | ||
36 | |||
37 | AC_LANG_PUSH([C]) | ||
38 | _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 11708de1c8..46d1b91d65 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 \ | |||
6 | file://COPYING.EXCEPTION;md5=fdef168ebff3bc2f13664c365a5fb515" | 6 | file://COPYING.EXCEPTION;md5=fdef168ebff3bc2f13664c365a5fb515" |
7 | 7 | ||
8 | SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz" | 8 | SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz" |
9 | SRC_URI += "file://427e226a2fe3980388abffd6de25ed6b9591cce3.patch" | ||
10 | SRC_URI += "file://3a23daa3da0eb1a256fda631867e19345d5f6e3a.patch" | ||
11 | SRC_URI += "file://e25f8d9e3ead52f998535b86c763065c5b45cc59.patch" | ||
9 | SRC_URI[sha256sum] = "7bcd5d001916f3a50ed7436f4f700e3d2b1bade3ed803219c592d62502a57363" | 12 | SRC_URI[sha256sum] = "7bcd5d001916f3a50ed7436f4f700e3d2b1bade3ed803219c592d62502a57363" |
10 | 13 | ||
11 | inherit autotools allarch texinfo | 14 | inherit autotools allarch texinfo |