From 3d4834860c0e9c2635c248d498d02160cbedebde Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 5 Sep 2016 23:29:59 +0100 Subject: autoconf: remove upstreamed patch Signed-off-by: Ross Burton --- .../autoconf/autoconf/autoreconf-include.patch | 14 -------------- meta/recipes-devtools/autoconf/autoconf_2.69.bb | 3 +-- 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 meta/recipes-devtools/autoconf/autoconf/autoreconf-include.patch 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 \ -- cgit 1.2.3-korg