summaryrefslogtreecommitdiffstats
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:31:33 +0100
commit3d4834860c0e9c2635c248d498d02160cbedebde (patch)
treeb17f9f99550bc77236bb9d6759ba547fd79de68e
parent0ce7415bb50bf1941981ef61590fe642b055d290 (diff)
downloadopenembedded-core-contrib-3d4834860c0e9c2635c248d498d02160cbedebde.tar.gz
openembedded-core-contrib-3d4834860c0e9c2635c248d498d02160cbedebde.tar.bz2
openembedded-core-contrib-3d4834860c0e9c2635c248d498d02160cbedebde.zip
autoconf: remove upstreamed patch
Signed-off-by: Ross Burton <ross.burton@intel.com>
-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 @@
-Upstream-Status: Pending
-
-Index: autoconf-2.63/bin/autoreconf.in
-===================================================================
---- autoconf-2.63.orig/bin/autoreconf.in 2008-08-28 03:08:10.000000000 +0100
-+++ autoconf-2.63/bin/autoreconf.in 2008-12-31 17:38:40.000000000 +0000
-@@ -190,6 +190,7 @@
- $autoconf .= join (' --prepend-include=', '', map { shell_quote ($_) } @prepend_include);
- $autoheader .= join (' --include=', '', map { shell_quote ($_) } @include);
- $autoheader .= join (' --prepend-include=', '', map { shell_quote ($_) } @prepend_include);
-+ $aclocal .= join (' -I ', '', map { shell_quote ($_) } @include);
-
- # --install and --symlink;
- 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"
LICENSE = "GPLv2 & GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504"
-SRC_URI += "file://autoreconf-include.patch \
- file://check-automake-cross-warning.patch \
+SRC_URI += "file://check-automake-cross-warning.patch \
file://autoreconf-exclude.patch \
file://autoreconf-gnuconfigize.patch \
file://config_site.patch \