diff options
Diffstat (limited to 'meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch')
-rw-r--r-- | meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch | 26 |
1 files changed, 12 insertions, 14 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 | |||