summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-09-05 23:29:59 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-08 00:32:43 +0100
commitf52cc8bdefc4d063ae077d3c1ecfdd3de4ee29f9 (patch)
tree2b32f5020714a9c813de053f6cb0e6aa781f94af /meta/recipes-devtools
parent0d92f448c435f528a3fb526731c9047cb2fd9215 (diff)
downloadpoky-f52cc8bdefc4d063ae077d3c1ecfdd3de4ee29f9.tar.gz
autoconf: remove upstreamed patch
(From OE-Core rev: 3d4834860c0e9c2635c248d498d02160cbedebde) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/autoconf/autoconf/autoreconf-include.patch14
-rw-r--r--meta/recipes-devtools/autoconf/autoconf_2.69.bb3
2 files changed, 1 insertions, 16 deletions
diff --git a/meta/recipes-devtools/autoconf/autoconf/autoreconf-include.patch b/meta/recipes-devtools/autoconf/autoconf/autoreconf-include.patch
deleted file mode 100644
index 31326f0bc8..0000000000
--- a/meta/recipes-devtools/autoconf/autoconf/autoreconf-include.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1Upstream-Status: Pending
2
3Index: autoconf-2.63/bin/autoreconf.in
4===================================================================
5--- autoconf-2.63.orig/bin/autoreconf.in 2008-08-28 03:08:10.000000000 +0100
6+++ autoconf-2.63/bin/autoreconf.in 2008-12-31 17:38:40.000000000 +0000
7@@ -190,6 +190,7 @@
8 $autoconf .= join (' --prepend-include=', '', map { shell_quote ($_) } @prepend_include);
9 $autoheader .= join (' --include=', '', map { shell_quote ($_) } @include);
10 $autoheader .= join (' --prepend-include=', '', map { shell_quote ($_) } @prepend_include);
11+ $aclocal .= join (' -I ', '', map { shell_quote ($_) } @include);
12
13 # --install and --symlink;
14 if ($install)
diff --git a/meta/recipes-devtools/autoconf/autoconf_2.69.bb b/meta/recipes-devtools/autoconf/autoconf_2.69.bb
index adb6ad7ccf..aa1877a1fb 100644
--- a/meta/recipes-devtools/autoconf/autoconf_2.69.bb
+++ b/meta/recipes-devtools/autoconf/autoconf_2.69.bb
@@ -5,8 +5,7 @@ PR = "r11"
5LICENSE = "GPLv2 & GPLv3" 5LICENSE = "GPLv2 & GPLv3"
6LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
7 file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504" 7 file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504"
8SRC_URI += "file://autoreconf-include.patch \ 8SRC_URI += "file://check-automake-cross-warning.patch \
9 file://check-automake-cross-warning.patch \
10 file://autoreconf-exclude.patch \ 9 file://autoreconf-exclude.patch \
11 file://autoreconf-gnuconfigize.patch \ 10 file://autoreconf-gnuconfigize.patch \
12 file://config_site.patch \ 11 file://config_site.patch \