[oe-commits] [openembedded-core] 03/24: autoconf: remove upstreamed patch

[git at git.openembedded.org]

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 3d4834860c0e9c2635c248d498d02160cbedebde
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Mon Sep 5 23:29:59 2016 +0100

    autoconf: remove upstreamed patch
    
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 .../autoconf/autoconf/autoreconf-include.patch             | 14 --------------
 meta/recipes-devtools/autoconf/autoconf_2.69.bb            |  3 +--
 2 files changed, 1 insertion(+), 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 31326f0..0000000
--- 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 adb6ad7..aa1877a 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 \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.