diff options
| author | Ross Burton <ross.burton@intel.com> | 2014-07-15 17:18:37 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-29 09:58:26 +0100 |
| commit | 931fd019bf2daead863f92d0f8d254378b9edffd (patch) | |
| tree | 7609351ab92a1ed1e87813046fb4381addbab292 | |
| parent | addeef1dc91306175824b1f5587e40a22773cff4 (diff) | |
| download | poky-931fd019bf2daead863f92d0f8d254378b9edffd.tar.gz | |
autoconf: remove automake patch enforcing --foreign
Since 2004 we've been carrying a patch[1] make autoreconf pass --foreign to
automake. Presumably at the time this was due to many upstreams using
hand-coded bootstrap scripts that passed --foreign manually, but we were using
autoreconf. These days many projects have added foreign to AM_INIT_AUTOMAKE and
use autoreconf directly, so this patch isn't as critical as it used to be.
(From OE-Core rev: 74b05bba64589da0e4439a4293559ad9670104bd)
Signed-off-by: Ross Burton <ross.burton@intel.com>
[1] oe-classic 2ab2a92eadaf2f80410d8746099f8a9b1b81ff91
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/autoconf/autoconf/autoreconf-foreign.patch | 13 | ||||
| -rw-r--r-- | meta/recipes-devtools/autoconf/autoconf_2.69.bb | 1 |
2 files changed, 0 insertions, 14 deletions
diff --git a/meta/recipes-devtools/autoconf/autoconf/autoreconf-foreign.patch b/meta/recipes-devtools/autoconf/autoconf/autoreconf-foreign.patch deleted file mode 100644 index 88f750195d..0000000000 --- a/meta/recipes-devtools/autoconf/autoconf/autoreconf-foreign.patch +++ /dev/null | |||
| @@ -1,13 +0,0 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | |||
| 3 | --- autoconf-2.59/bin/autoreconf.in~autoreconf-foreign 2004-05-09 20:55:06.000000000 -0400 | ||
| 4 | +++ autoconf-2.59/bin/autoreconf.in 2004-05-09 20:55:55.000000000 -0400 | ||
| 5 | @@ -184,6 +184,8 @@ | ||
| 6 | |||
| 7 | $aclocal_supports_force = `$aclocal --help` =~ /--force/; | ||
| 8 | |||
| 9 | + $automake .= ' --foreign'; | ||
| 10 | + | ||
| 11 | # Dispatch autoreconf's option to the tools. | ||
| 12 | # --include; | ||
| 13 | $autoconf .= join (' --include=', '', @include); | ||
diff --git a/meta/recipes-devtools/autoconf/autoconf_2.69.bb b/meta/recipes-devtools/autoconf/autoconf_2.69.bb index 5c652d43fa..6614a7b780 100644 --- a/meta/recipes-devtools/autoconf/autoconf_2.69.bb +++ b/meta/recipes-devtools/autoconf/autoconf_2.69.bb | |||
| @@ -10,7 +10,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ | |||
| 10 | SRC_URI += "file://autoreconf-include.patch \ | 10 | SRC_URI += "file://autoreconf-include.patch \ |
| 11 | file://check-automake-cross-warning.patch \ | 11 | file://check-automake-cross-warning.patch \ |
| 12 | file://autoreconf-exclude.patch \ | 12 | file://autoreconf-exclude.patch \ |
| 13 | file://autoreconf-foreign.patch \ | ||
| 14 | file://autoreconf-gnuconfigize.patch \ | 13 | file://autoreconf-gnuconfigize.patch \ |
| 15 | file://config_site.patch \ | 14 | file://config_site.patch \ |
| 16 | file://remove-usr-local-lib-from-m4.patch \ | 15 | file://remove-usr-local-lib-from-m4.patch \ |
