summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-02-11 06:02:02 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-12 13:22:43 +0000
commit628fc90d7b2c0ca4249734b98bcf9c50ef6c2948 (patch)
tree6f391d088d2b7413b3cf6d68051ede0b6de135ae
parent311924f506b796e42cd287180cf580f176d46399 (diff)
downloadpoky-628fc90d7b2c0ca4249734b98bcf9c50ef6c2948.tar.gz
diffutils: replace obsolete automake macros with working ones
Add obsolete_automake_macros.patch that replaces automake macros no longer supported by automake-1.13 with modern constructs. Removed AM_PROG_CC_STDC. AC_PROG_CC to replace it was already present. (From OE-Core rev: 5e1a567872d6967ac4d5b78e9d226161d9651ded) Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/diffutils/diffutils-3.2/obsolete_automake_macros.patch14
-rw-r--r--meta/recipes-extended/diffutils/diffutils_3.2.bb6
2 files changed, 18 insertions, 2 deletions
diff --git a/meta/recipes-extended/diffutils/diffutils-3.2/obsolete_automake_macros.patch b/meta/recipes-extended/diffutils/diffutils-3.2/obsolete_automake_macros.patch
new file mode 100644
index 0000000000..f47cc79366
--- /dev/null
+++ b/meta/recipes-extended/diffutils/diffutils-3.2/obsolete_automake_macros.patch
@@ -0,0 +1,14 @@
1Upstream-Status: Backport
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd diffutils-3.2/configure.ac diffutils-3.2/configure.ac
5--- diffutils-3.2/configure.ac 2011-08-11 18:17:54.000000000 +0300
6+++ diffutils-3.2/configure.ac 2013-02-08 08:13:28.271427213 +0200
7@@ -33,7 +33,6 @@
8
9 AC_PROG_AWK
10 AC_PROG_CC
11-AM_PROG_CC_STDC
12 AM_MISSING_PROG([HELP2MAN], [help2man])
13 AC_PROG_RANLIB
14 gl_EARLY
diff --git a/meta/recipes-extended/diffutils/diffutils_3.2.bb b/meta/recipes-extended/diffutils/diffutils_3.2.bb
index 400c8a6b3f..ef400efd1c 100644
--- a/meta/recipes-extended/diffutils/diffutils_3.2.bb
+++ b/meta/recipes-extended/diffutils/diffutils_3.2.bb
@@ -10,9 +10,11 @@ do_configure_prepend () {
10 done 10 done
11} 11}
12 12
13PR = "${INC_PR}.0" 13PR = "${INC_PR}.1"
14 14
15SRC_URI += "file://remove-gets.patch" 15SRC_URI += "file://remove-gets.patch \
16 file://obsolete_automake_macros.patch \
17"
16 18
17SRC_URI[md5sum] = "22e4deef5d8949a727b159d6bc65c1cc" 19SRC_URI[md5sum] = "22e4deef5d8949a727b159d6bc65c1cc"
18SRC_URI[sha256sum] = "2aaaebef615be7dc365306a14caa5d273a4fc174f9f10abca8b60e082c054ed3" 20SRC_URI[sha256sum] = "2aaaebef615be7dc365306a14caa5d273a4fc174f9f10abca8b60e082c054ed3"