summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-exclude.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-exclude.patch')
-rw-r--r--meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-exclude.patch137
1 files changed, 137 insertions, 0 deletions
diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-exclude.patch b/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-exclude.patch
new file mode 100644
index 0000000000..fac7483bd1
--- /dev/null
+++ b/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-exclude.patch
@@ -0,0 +1,137 @@
1Index: autoconf-2.63/bin/autoreconf.in
2===================================================================
3--- autoconf-2.63.orig/bin/autoreconf.in 2008-12-31 17:39:01.000000000 +0000
4+++ autoconf-2.63/bin/autoreconf.in 2008-12-31 17:43:38.000000000 +0000
5@@ -76,6 +76,7 @@
6 -i, --install copy missing auxiliary files
7 --no-recursive don't rebuild sub-packages
8 -s, --symlink with -i, install symbolic links instead of copies
9+ -x, --exclude=STEPS steps we should not run
10 -m, --make when applicable, re-run ./configure && make
11 -W, --warnings=CATEGORY report the warnings falling in CATEGORY [syntax]
12
13@@ -136,6 +137,13 @@
14 # Recurse into subpackages
15 my $recursive = 1;
16
17+# Steps to exclude
18+my @exclude;
19+my @ex;
20+
21+my $uses_gettext;
22+my $configure_ac;
23+
24 ## ---------- ##
25 ## Routines. ##
26 ## ---------- ##
27@@ -153,6 +161,7 @@
28 'B|prepend-include=s' => \@prepend_include,
29 'i|install' => \$install,
30 's|symlink' => \$symlink,
31+ 'x|exclude=s' => \@exclude,
32 'm|make' => \$run_make,
33 'recursive!' => \$recursive);
34
35@@ -162,6 +171,8 @@
36 parse_WARNINGS;
37 parse_warnings '--warnings', @warning;
38
39+ @exclude = map { split /,/ } @exclude;
40+
41 # Even if the user specified a configure.ac, trim to get the
42 # directory, and look for configure.ac again. Because (i) the code
43 # is simpler, and (ii) we are still able to diagnose simultaneous
44@@ -255,6 +266,11 @@
45 {
46 my ($aclocal, $flags) = @_;
47
48+ @ex = grep (/^aclocal$/, @exclude);
49+ if ($#ex != -1) {
50+ return;
51+ }
52+
53 # aclocal 1.8+ does all this for free. It can be recognized by its
54 # --force support.
55 if ($aclocal_supports_force)
56@@ -368,7 +384,10 @@
57 }
58 else
59 {
60- xsystem_hint ("autopoint is needed because this package uses Gettext", "$autopoint");
61+ @ex = grep (/^autopoint$/, @exclude);
62+ if ($#ex == -1) {
63+ xsystem_hint ("autopoint is needed because this package uses Gettext", "$autopoint");
64+ }
65 }
66
67
68@@ -532,16 +551,17 @@
69 {
70 $libtoolize .= " --ltdl";
71 }
72- xsystem_hint ("libtoolize is needed because this package uses Libtool", $libtoolize);
73- $rerun_aclocal = 1;
74+ @ex = grep (/^libtoolize$/, @exclude);
75+ if ($#ex == -1) {
76+ xsystem_hint ("libtoolize is needed because this package uses Libtool", $libtoolize);
77+ $rerun_aclocal = 1;
78+ }
79 }
80 else
81 {
82 verb "$configure_ac: not running libtoolize: --install not given";
83 }
84
85-
86-
87 # ------------------- #
88 # Rerunning aclocal. #
89 # ------------------- #
90@@ -572,7 +592,10 @@
91 # latter runs the former, and (ii) autoconf is stricter than
92 # autoheader. So all in all, autoconf should give better error
93 # messages.
94- xsystem ($autoconf);
95+ @ex = grep (/^autoconf$/, @exclude);
96+ if ($#ex == -1) {
97+ xsystem ("$autoconf");
98+ }
99
100
101 # -------------------- #
102@@ -593,7 +616,10 @@
103 }
104 else
105 {
106- xsystem ($autoheader);
107+ @ex = grep (/^autoheader$/, @exclude);
108+ if ($#ex == -1) {
109+ xsystem ("$autoheader");
110+ }
111 }
112
113
114@@ -610,7 +636,10 @@
115 # We should always run automake, and let it decide whether it shall
116 # update the file or not. In fact, the effect of `$force' is already
117 # included in `$automake' via `--no-force'.
118- xsystem ($automake);
119+ @ex = grep (/^automake$/, @exclude);
120+ if ($#ex == -1) {
121+ xsystem ("$automake");
122+ }
123 }
124
125
126@@ -634,7 +663,10 @@
127 }
128 else
129 {
130- xsystem ("$make");
131+ @ex = grep (/^make$/, @exclude);
132+ if ($#ex == -1) {
133+ xsystem ("$make");
134+ }
135 }
136 }
137 }