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