diff options
-rw-r--r-- | meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch | 26 | ||||
-rw-r--r-- | meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch | 22 | ||||
-rw-r--r-- | meta/recipes-devtools/autoconf/autoconf/man-host-perl.patch | 13 | ||||
-rw-r--r-- | meta/recipes-devtools/autoconf/autoconf/no-man.patch | 19 | ||||
-rw-r--r-- | meta/recipes-devtools/autoconf/autoconf/preferbash.patch | 12 | ||||
-rw-r--r-- | meta/recipes-devtools/autoconf/autoconf/program_prefix.patch | 12 | ||||
-rw-r--r-- | meta/recipes-devtools/autoconf/autoconf/remove-usr-local-lib-from-m4.patch | 12 | ||||
-rw-r--r-- | meta/recipes-devtools/autoconf/autoconf_2.72e.bb (renamed from meta/recipes-devtools/autoconf/autoconf_2.72d.bb) | 2 |
8 files changed, 65 insertions, 53 deletions
diff --git a/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch b/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch index c73aca41ee..2814196200 100644 --- a/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch +++ b/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch | |||
@@ -1,25 +1,26 @@ | |||
1 | From 0071d28e304745a16871561f23117fdb00dd2559 Mon Sep 17 00:00:00 2001 | 1 | From 1a50157aa11da48921200a0d8d4308863716eab0 Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Thu, 12 Mar 2020 17:25:23 +0000 | 3 | Date: Thu, 12 Mar 2020 17:25:23 +0000 |
4 | Subject: [PATCH 4/7] autoreconf-exclude.patch | 4 | Subject: [PATCH] autoreconf-exclude.patch |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [oe specific] | 6 | Upstream-Status: Inappropriate [oe specific] |
7 | |||
7 | --- | 8 | --- |
8 | bin/autoreconf.in | 26 ++++++++++++++++++++++++++ | 9 | bin/autoreconf.in | 26 ++++++++++++++++++++++++++ |
9 | 1 file changed, 26 insertions(+) | 10 | 1 file changed, 26 insertions(+) |
10 | 11 | ||
11 | diff --git a/bin/autoreconf.in b/bin/autoreconf.in | 12 | diff --git a/bin/autoreconf.in b/bin/autoreconf.in |
12 | index bb9f316d..7da3005b 100644 | 13 | index 98ebab6..937f758 100644 |
13 | --- a/bin/autoreconf.in | 14 | --- a/bin/autoreconf.in |
14 | +++ b/bin/autoreconf.in | 15 | +++ b/bin/autoreconf.in |
15 | @@ -82,6 +82,7 @@ Operation modes: | 16 | @@ -83,6 +83,7 @@ Operation modes: |
16 | -i, --install copy missing standard auxiliary files | 17 | -i, --install copy missing standard auxiliary files |
17 | --no-recursive don't rebuild sub-packages | 18 | --no-recursive don't rebuild sub-packages |
18 | -s, --symlink with -i, install symbolic links instead of copies | 19 | -s, --symlink with -i, install symbolic links instead of copies |
19 | + -x, --exclude=STEPS steps we should not run | 20 | + -x, --exclude=STEPS steps we should not run |
20 | -m, --make when applicable, re-run ./configure && make | 21 | -m, --make when applicable, re-run ./configure && make |
21 | -W, --warnings=CATEGORY report the warnings falling in CATEGORY [syntax] | 22 | -W, --warnings=CATEGORY report the warnings falling in CATEGORY |
22 | 23 | (comma-separated list accepted) | |
23 | @@ -141,6 +142,10 @@ my $run_make = 0; | 24 | @@ -141,6 +142,10 @@ my $run_make = 0; |
24 | # Recurse into subpackages | 25 | # Recurse into subpackages |
25 | my $recursive = 1; | 26 | my $recursive = 1; |
@@ -60,7 +61,7 @@ index bb9f316d..7da3005b 100644 | |||
60 | } | 61 | } |
61 | 62 | ||
62 | 63 | ||
63 | @@ -687,9 +698,12 @@ sub autoreconf_current_directory ($) | 64 | @@ -691,9 +702,12 @@ sub autoreconf_current_directory ($) |
64 | { | 65 | { |
65 | $libtoolize .= " --ltdl"; | 66 | $libtoolize .= " --ltdl"; |
66 | } | 67 | } |
@@ -73,7 +74,7 @@ index bb9f316d..7da3005b 100644 | |||
73 | } | 74 | } |
74 | else | 75 | else |
75 | { | 76 | { |
76 | @@ -726,8 +740,11 @@ sub autoreconf_current_directory ($) | 77 | @@ -730,8 +744,11 @@ sub autoreconf_current_directory ($) |
77 | } | 78 | } |
78 | elsif ($install) | 79 | elsif ($install) |
79 | { | 80 | { |
@@ -85,7 +86,7 @@ index bb9f316d..7da3005b 100644 | |||
85 | } | 86 | } |
86 | else | 87 | else |
87 | { | 88 | { |
88 | @@ -765,7 +782,10 @@ sub autoreconf_current_directory ($) | 89 | @@ -769,7 +786,10 @@ sub autoreconf_current_directory ($) |
89 | # latter runs the former, and (ii) autoconf is stricter than | 90 | # latter runs the former, and (ii) autoconf is stricter than |
90 | # autoheader. So all in all, autoconf should give better error | 91 | # autoheader. So all in all, autoconf should give better error |
91 | # messages. | 92 | # messages. |
@@ -96,7 +97,7 @@ index bb9f316d..7da3005b 100644 | |||
96 | 97 | ||
97 | 98 | ||
98 | # -------------------- # | 99 | # -------------------- # |
99 | @@ -786,7 +806,10 @@ sub autoreconf_current_directory ($) | 100 | @@ -790,7 +810,10 @@ sub autoreconf_current_directory ($) |
100 | } | 101 | } |
101 | else | 102 | else |
102 | { | 103 | { |
@@ -107,7 +108,7 @@ index bb9f316d..7da3005b 100644 | |||
107 | } | 108 | } |
108 | 109 | ||
109 | 110 | ||
110 | @@ -803,7 +826,10 @@ sub autoreconf_current_directory ($) | 111 | @@ -807,7 +830,10 @@ sub autoreconf_current_directory ($) |
111 | # We should always run automake, and let it decide whether it shall | 112 | # We should always run automake, and let it decide whether it shall |
112 | # update the file or not. In fact, the effect of '$force' is already | 113 | # update the file or not. In fact, the effect of '$force' is already |
113 | # included in '$automake' via '--no-force'. | 114 | # included in '$automake' via '--no-force'. |
@@ -118,6 +119,3 @@ index bb9f316d..7da3005b 100644 | |||
118 | } | 119 | } |
119 | 120 | ||
120 | # ---------------------------------------------------- # | 121 | # ---------------------------------------------------- # |
121 | -- | ||
122 | 2.25.1 | ||
123 | |||
diff --git a/meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch b/meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch index 23329f7927..38725574ba 100644 --- a/meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch +++ b/meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch | |||
@@ -1,18 +1,19 @@ | |||
1 | From 8c0f24404bebffdaf3132d81e2b9560d34ff1677 Mon Sep 17 00:00:00 2001 | 1 | From b28bd61e4716e744617bd681a5b0d5472f62bd67 Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Thu, 12 Mar 2020 17:25:45 +0000 | 3 | Date: Thu, 12 Mar 2020 17:25:45 +0000 |
4 | Subject: [PATCH 6/7] autotest-automake-result-format.patch | 4 | Subject: [PATCH] autotest-automake-result-format.patch |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [oe specific] | 6 | Upstream-Status: Inappropriate [oe specific] |
7 | |||
7 | --- | 8 | --- |
8 | lib/autotest/general.m4 | 39 +++++++++++++++++++++++++++++---------- | 9 | lib/autotest/general.m4 | 39 +++++++++++++++++++++++++++++---------- |
9 | 1 file changed, 29 insertions(+), 10 deletions(-) | 10 | 1 file changed, 29 insertions(+), 10 deletions(-) |
10 | 11 | ||
11 | diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4 | 12 | diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4 |
12 | index 0c0e3c5b..17590e96 100644 | 13 | index bf18866..8097523 100644 |
13 | --- a/lib/autotest/general.m4 | 14 | --- a/lib/autotest/general.m4 |
14 | +++ b/lib/autotest/general.m4 | 15 | +++ b/lib/autotest/general.m4 |
15 | @@ -412,6 +412,9 @@ at_recheck= | 16 | @@ -427,6 +427,9 @@ at_recheck= |
16 | # Whether a write failure occurred | 17 | # Whether a write failure occurred |
17 | at_write_fail=0 | 18 | at_write_fail=0 |
18 | 19 | ||
@@ -22,7 +23,7 @@ index 0c0e3c5b..17590e96 100644 | |||
22 | # The directory we run the suite in. Default to . if no -C option. | 23 | # The directory we run the suite in. Default to . if no -C option. |
23 | at_dir=`pwd` | 24 | at_dir=`pwd` |
24 | # An absolute reference to this testsuite script. | 25 | # An absolute reference to this testsuite script. |
25 | @@ -525,6 +528,10 @@ do | 26 | @@ -540,6 +543,10 @@ do |
26 | at_check_filter_trace=at_fn_filter_trace | 27 | at_check_filter_trace=at_fn_filter_trace |
27 | ;; | 28 | ;; |
28 | 29 | ||
@@ -33,7 +34,7 @@ index 0c0e3c5b..17590e96 100644 | |||
33 | [[0-9] | [0-9][0-9] | [0-9][0-9][0-9] | [0-9][0-9][0-9][0-9]]) | 34 | [[0-9] | [0-9][0-9] | [0-9][0-9][0-9] | [0-9][0-9][0-9][0-9]]) |
34 | at_fn_validate_ranges at_option | 35 | at_fn_validate_ranges at_option |
35 | AS_VAR_APPEND([at_groups], ["$at_option$as_nl"]) | 36 | AS_VAR_APPEND([at_groups], ["$at_option$as_nl"]) |
36 | @@ -713,10 +720,10 @@ m4_divert_push([HELP_MODES])dnl | 37 | @@ -728,10 +735,10 @@ m4_divert_push([HELP_MODES])dnl |
37 | cat <<_ATEOF || at_write_fail=1 | 38 | cat <<_ATEOF || at_write_fail=1 |
38 | 39 | ||
39 | Operation modes: | 40 | Operation modes: |
@@ -48,7 +49,7 @@ index 0c0e3c5b..17590e96 100644 | |||
48 | _ATEOF | 49 | _ATEOF |
49 | m4_divert_pop([HELP_MODES])dnl | 50 | m4_divert_pop([HELP_MODES])dnl |
50 | m4_wrap([m4_divert_push([HELP_TUNING_BEGIN])dnl | 51 | m4_wrap([m4_divert_push([HELP_TUNING_BEGIN])dnl |
51 | @@ -742,6 +749,7 @@ Execution tuning: | 52 | @@ -757,6 +764,7 @@ Execution tuning: |
52 | -d, --debug inhibit clean up and top-level logging | 53 | -d, --debug inhibit clean up and top-level logging |
53 | [ default for debugging scripts] | 54 | [ default for debugging scripts] |
54 | -x, --trace enable tests shell tracing | 55 | -x, --trace enable tests shell tracing |
@@ -56,7 +57,7 @@ index 0c0e3c5b..17590e96 100644 | |||
56 | _ATEOF | 57 | _ATEOF |
57 | m4_divert_pop([HELP_TUNING_BEGIN])])dnl | 58 | m4_divert_pop([HELP_TUNING_BEGIN])])dnl |
58 | m4_divert_push([HELP_END])dnl | 59 | m4_divert_push([HELP_END])dnl |
59 | @@ -1129,7 +1137,9 @@ at_fn_group_banner () | 60 | @@ -1139,7 +1147,9 @@ at_fn_group_banner () |
60 | [*]) at_desc_line="$[1]: " ;; | 61 | [*]) at_desc_line="$[1]: " ;; |
61 | esac | 62 | esac |
62 | AS_VAR_APPEND([at_desc_line], ["$[3]$[4]"]) | 63 | AS_VAR_APPEND([at_desc_line], ["$[3]$[4]"]) |
@@ -67,7 +68,7 @@ index 0c0e3c5b..17590e96 100644 | |||
67 | echo "# -*- compilation -*-" >> "$at_group_log" | 68 | echo "# -*- compilation -*-" >> "$at_group_log" |
68 | } | 69 | } |
69 | 70 | ||
70 | @@ -1155,42 +1165,51 @@ _ATEOF | 71 | @@ -1165,42 +1175,51 @@ _ATEOF |
71 | case $at_xfail:$at_status in | 72 | case $at_xfail:$at_status in |
72 | yes:0) | 73 | yes:0) |
73 | at_msg="UNEXPECTED PASS" | 74 | at_msg="UNEXPECTED PASS" |
@@ -124,6 +125,3 @@ index 0c0e3c5b..17590e96 100644 | |||
124 | fi | 125 | fi |
125 | at_log_msg="$at_group. $at_desc ($at_setup_line): $at_msg" | 126 | at_log_msg="$at_group. $at_desc ($at_setup_line): $at_msg" |
126 | case $at_status in | 127 | case $at_status in |
127 | -- | ||
128 | 2.25.1 | ||
129 | |||
diff --git a/meta/recipes-devtools/autoconf/autoconf/man-host-perl.patch b/meta/recipes-devtools/autoconf/autoconf/man-host-perl.patch index c6c135625d..0f49583a64 100644 --- a/meta/recipes-devtools/autoconf/autoconf/man-host-perl.patch +++ b/meta/recipes-devtools/autoconf/autoconf/man-host-perl.patch | |||
@@ -1,13 +1,20 @@ | |||
1 | Don't use the target perl when regenerating the man pages. | 1 | From 1c033f2a23941c46d88b9ac279f87bf2c6e99499 Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@arm.com> | ||
3 | Date: Wed, 15 Jul 2020 16:03:21 +0100 | ||
4 | Subject: [PATCH] Don't use the target perl when regenerating the man pages. | ||
2 | 5 | ||
3 | Upstream-Status: Inappropriate | 6 | Upstream-Status: Inappropriate |
4 | Signed-off-by: Ross Burton <ross.burton@arm.com> | 7 | Signed-off-by: Ross Burton <ross.burton@arm.com> |
5 | 8 | ||
9 | --- | ||
10 | man/local.mk | 3 +-- | ||
11 | 1 file changed, 1 insertion(+), 2 deletions(-) | ||
12 | |||
6 | diff --git a/man/local.mk b/man/local.mk | 13 | diff --git a/man/local.mk b/man/local.mk |
7 | index e69858b1..78c68ab5 100644 | 14 | index 775c131..ba94753 100644 |
8 | --- a/man/local.mk | 15 | --- a/man/local.mk |
9 | +++ b/man/local.mk | 16 | +++ b/man/local.mk |
10 | @@ -67,13 +67,12 @@ SUFFIXES += .w .1 | 17 | @@ -77,13 +77,12 @@ SUFFIXES += .w .1 |
11 | @echo "Updating man page $@" | 18 | @echo "Updating man page $@" |
12 | $(MKDIR_P) $(@D) | 19 | $(MKDIR_P) $(@D) |
13 | PATH="$(top_srcdir)/man$(PATH_SEPARATOR)$$PATH"; \ | 20 | PATH="$(top_srcdir)/man$(PATH_SEPARATOR)$$PATH"; \ |
diff --git a/meta/recipes-devtools/autoconf/autoconf/no-man.patch b/meta/recipes-devtools/autoconf/autoconf/no-man.patch index 2c44375f43..3e741edfb2 100644 --- a/meta/recipes-devtools/autoconf/autoconf/no-man.patch +++ b/meta/recipes-devtools/autoconf/autoconf/no-man.patch | |||
@@ -1,14 +1,26 @@ | |||
1 | From 8bcaf677e41f1f5d3fa0a746e35958e7b303ac71 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@arm.com> | ||
3 | Date: Wed, 15 Jul 2020 16:03:21 +0100 | ||
4 | Subject: [PATCH] autoconf: upgrade to 2.71 | ||
5 | |||
1 | For native builds we don't care about the documentation, and this would | 6 | For native builds we don't care about the documentation, and this would |
2 | otherwise pull in a dependency on help2man. | 7 | otherwise pull in a dependency on help2man. |
3 | 8 | ||
4 | Upstream-Status: Inappropriate | 9 | Upstream-Status: Inappropriate |
5 | Signed-off-by: Ross Burton <ross.burton@arm.com> | 10 | Signed-off-by: Ross Burton <ross.burton@arm.com> |
6 | 11 | ||
12 | --- | ||
13 | Makefile.in | 10 ---------- | ||
14 | 1 file changed, 10 deletions(-) | ||
15 | |||
7 | diff --git a/Makefile.in b/Makefile.in | 16 | diff --git a/Makefile.in b/Makefile.in |
8 | index 146e8e3..a1827c1 100644 | 17 | index c8d6425..72d6d05 100644 |
9 | --- a/Makefile.in | 18 | --- a/Makefile.in |
10 | +++ b/Makefile.in | 19 | +++ b/Makefile.in |
11 | @@ -763,10 +762,0 @@ dist_buildaux_SCRIPTS = \ | 20 | @@ -771,16 +771,6 @@ buildauxdir = $(pkgdatadir)/build-aux |
21 | dist_buildaux_DATA = \ | ||
22 | $(AUXSCRIPTS) | ||
23 | |||
12 | -dist_man_MANS = \ | 24 | -dist_man_MANS = \ |
13 | - man/autoconf.1 \ | 25 | - man/autoconf.1 \ |
14 | - man/autoheader.1 \ | 26 | - man/autoheader.1 \ |
@@ -19,3 +31,6 @@ index 146e8e3..a1827c1 100644 | |||
19 | - man/ifnames.1 | 31 | - man/ifnames.1 |
20 | - | 32 | - |
21 | - | 33 | - |
34 | # Each manpage depends on: | ||
35 | # - its .w and .x files and its source script in bin/ | ||
36 | # - common.x for the SEE ALSO list | ||
diff --git a/meta/recipes-devtools/autoconf/autoconf/preferbash.patch b/meta/recipes-devtools/autoconf/autoconf/preferbash.patch index cfb145a279..64fed1fd82 100644 --- a/meta/recipes-devtools/autoconf/autoconf/preferbash.patch +++ b/meta/recipes-devtools/autoconf/autoconf/preferbash.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 0aac3047cd7681d610b22d79501c297fa3433148 Mon Sep 17 00:00:00 2001 | 1 | From a877ff979349d3bf6f5f0d92fe4e741be0ad98b4 Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Thu, 12 Mar 2020 17:25:41 +0000 | 3 | Date: Thu, 12 Mar 2020 17:25:41 +0000 |
4 | Subject: [PATCH 2/7] m4sh: prefer bash over sh | 4 | Subject: [PATCH] m4sh: prefer bash over sh |
5 | 5 | ||
6 | _AS_DETECT_BETTER_SHELL looks for a good shell to use, and tries to look for | 6 | _AS_DETECT_BETTER_SHELL looks for a good shell to use, and tries to look for |
7 | 'sh' before 'bash'. Whilst for many systems sh is a symlink to bash, | 7 | 'sh' before 'bash'. Whilst for many systems sh is a symlink to bash, |
@@ -16,15 +16,16 @@ Change the search order to bash then sh, so that a known-good shell (bash) | |||
16 | is used if available over something which is merely POSIX compliant. | 16 | is used if available over something which is merely POSIX compliant. |
17 | 17 | ||
18 | Upstream-Status: Inappropriate [oe specific] | 18 | Upstream-Status: Inappropriate [oe specific] |
19 | |||
19 | --- | 20 | --- |
20 | lib/m4sugar/m4sh.m4 | 2 +- | 21 | lib/m4sugar/m4sh.m4 | 2 +- |
21 | 1 file changed, 1 insertion(+), 1 deletion(-) | 22 | 1 file changed, 1 insertion(+), 1 deletion(-) |
22 | 23 | ||
23 | diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4 | 24 | diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4 |
24 | index 9d543952..84ef84a9 100644 | 25 | index 368487f..cc70f51 100644 |
25 | --- a/lib/m4sugar/m4sh.m4 | 26 | --- a/lib/m4sugar/m4sh.m4 |
26 | +++ b/lib/m4sugar/m4sh.m4 | 27 | +++ b/lib/m4sugar/m4sh.m4 |
27 | @@ -230,7 +230,7 @@ dnl Remove any tests from suggested that are also required | 28 | @@ -233,7 +233,7 @@ dnl Remove any tests from suggested that are also required |
28 | [_AS_PATH_WALK([/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH], | 29 | [_AS_PATH_WALK([/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH], |
29 | [case $as_dir in @%:@( | 30 | [case $as_dir in @%:@( |
30 | /*) | 31 | /*) |
@@ -33,6 +34,3 @@ index 9d543952..84ef84a9 100644 | |||
33 | # Try only shells that exist, to save several forks. | 34 | # Try only shells that exist, to save several forks. |
34 | as_shell=$as_dir$as_base | 35 | as_shell=$as_dir$as_base |
35 | AS_IF([{ test -f "$as_shell" || test -f "$as_shell.exe"; } && | 36 | AS_IF([{ test -f "$as_shell" || test -f "$as_shell.exe"; } && |
36 | -- | ||
37 | 2.25.1 | ||
38 | |||
diff --git a/meta/recipes-devtools/autoconf/autoconf/program_prefix.patch b/meta/recipes-devtools/autoconf/autoconf/program_prefix.patch index 657cbb351b..f647f2a8c0 100644 --- a/meta/recipes-devtools/autoconf/autoconf/program_prefix.patch +++ b/meta/recipes-devtools/autoconf/autoconf/program_prefix.patch | |||
@@ -1,19 +1,20 @@ | |||
1 | From f4f19a5c03e8ae3b9cc93d24b76694f4b7b2eb76 Mon Sep 17 00:00:00 2001 | 1 | From 7949496ff3834dcd98407cc3f3ea022ee2471d52 Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Thu, 12 Mar 2020 17:28:38 +0000 | 3 | Date: Thu, 12 Mar 2020 17:28:38 +0000 |
4 | Subject: [PATCH 3/7] program_prefix.patch | 4 | Subject: [PATCH] program_prefix.patch |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [oe specific] | 6 | Upstream-Status: Inappropriate [oe specific] |
7 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 7 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
8 | |||
8 | --- | 9 | --- |
9 | lib/autoconf/general.m4 | 2 +- | 10 | lib/autoconf/general.m4 | 2 +- |
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
11 | 12 | ||
12 | diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 | 13 | diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 |
13 | index 16f0d074..4c5e0b36 100644 | 14 | index 47d896d..3deaa46 100644 |
14 | --- a/lib/autoconf/general.m4 | 15 | --- a/lib/autoconf/general.m4 |
15 | +++ b/lib/autoconf/general.m4 | 16 | +++ b/lib/autoconf/general.m4 |
16 | @@ -2070,7 +2070,7 @@ _AC_CANONICAL_SPLIT([target]) | 17 | @@ -2071,7 +2071,7 @@ _AC_CANONICAL_SPLIT([target]) |
17 | 18 | ||
18 | # The aliases save the names the user supplied, while $host etc. | 19 | # The aliases save the names the user supplied, while $host etc. |
19 | # will get canonicalized. | 20 | # will get canonicalized. |
@@ -22,6 +23,3 @@ index 16f0d074..4c5e0b36 100644 | |||
22 | test "$program_prefix$program_suffix$program_transform_name" = \ | 23 | test "$program_prefix$program_suffix$program_transform_name" = \ |
23 | NONENONEs,x,x, && | 24 | NONENONEs,x,x, && |
24 | program_prefix=${target_alias}-[]dnl | 25 | program_prefix=${target_alias}-[]dnl |
25 | -- | ||
26 | 2.25.1 | ||
27 | |||
diff --git a/meta/recipes-devtools/autoconf/autoconf/remove-usr-local-lib-from-m4.patch b/meta/recipes-devtools/autoconf/autoconf/remove-usr-local-lib-from-m4.patch index f38780130a..ca1534b8f0 100644 --- a/meta/recipes-devtools/autoconf/autoconf/remove-usr-local-lib-from-m4.patch +++ b/meta/recipes-devtools/autoconf/autoconf/remove-usr-local-lib-from-m4.patch | |||
@@ -1,19 +1,20 @@ | |||
1 | From a08643ac3fef884900d6cfa161f0acec3ef104d1 Mon Sep 17 00:00:00 2001 | 1 | From 294a8d47a70db077691624615c5cb6d331a3299b Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Thu, 12 Mar 2020 17:25:37 +0000 | 3 | Date: Thu, 12 Mar 2020 17:25:37 +0000 |
4 | Subject: [PATCH 1/7] remove-usr-local-lib-from-m4.patch | 4 | Subject: [PATCH] remove-usr-local-lib-from-m4.patch |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [oe specific] | 6 | Upstream-Status: Inappropriate [oe specific] |
7 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 7 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
8 | |||
8 | --- | 9 | --- |
9 | lib/autoconf/functions.m4 | 9 --------- | 10 | lib/autoconf/functions.m4 | 9 --------- |
10 | 1 file changed, 9 deletions(-) | 11 | 1 file changed, 9 deletions(-) |
11 | 12 | ||
12 | diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4 | 13 | diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4 |
13 | index 12f60b99..07da7941 100644 | 14 | index 9b3f3c0..1faa99b 100644 |
14 | --- a/lib/autoconf/functions.m4 | 15 | --- a/lib/autoconf/functions.m4 |
15 | +++ b/lib/autoconf/functions.m4 | 16 | +++ b/lib/autoconf/functions.m4 |
16 | @@ -801,15 +801,6 @@ if test $ac_have_func = no; then | 17 | @@ -825,15 +825,6 @@ if test $ac_have_func = no; then |
17 | [LIBS="-lutil $LIBS" ac_have_func=yes ac_cv_func_getloadavg_setgid=yes]) | 18 | [LIBS="-lutil $LIBS" ac_have_func=yes ac_cv_func_getloadavg_setgid=yes]) |
18 | fi | 19 | fi |
19 | 20 | ||
@@ -29,6 +30,3 @@ index 12f60b99..07da7941 100644 | |||
29 | # Make sure it is really in the library, if we think we found it, | 30 | # Make sure it is really in the library, if we think we found it, |
30 | # otherwise set up the replacement function. | 31 | # otherwise set up the replacement function. |
31 | AC_CHECK_FUNCS(getloadavg, [], | 32 | AC_CHECK_FUNCS(getloadavg, [], |
32 | -- | ||
33 | 2.25.1 | ||
34 | |||
diff --git a/meta/recipes-devtools/autoconf/autoconf_2.72d.bb b/meta/recipes-devtools/autoconf/autoconf_2.72e.bb index 6741746184..db374373cf 100644 --- a/meta/recipes-devtools/autoconf/autoconf_2.72d.bb +++ b/meta/recipes-devtools/autoconf/autoconf_2.72e.bb | |||
@@ -22,7 +22,7 @@ SRC_URI = " \ | |||
22 | " | 22 | " |
23 | SRC_URI:append:class-native = " file://no-man.patch" | 23 | SRC_URI:append:class-native = " file://no-man.patch" |
24 | 24 | ||
25 | SRC_URI[sha256sum] = "c09dcba3d051507459df2fcd58d6f19e5b342568fa910e3bb3a74b4402cde3a6" | 25 | SRC_URI[sha256sum] = "f3478d3b597d51f5d61596fb2f6f6aba49cdd974b4b05ff0bac57f56b5cfdb39" |
26 | 26 | ||
27 | RDEPENDS:${PN} = "m4 gnu-config \ | 27 | RDEPENDS:${PN} = "m4 gnu-config \ |
28 | perl \ | 28 | perl \ |