diff options
-rw-r--r-- | meta/recipes-devtools/diffstat/diffstat/aclocal.patch | 11 | ||||
-rw-r--r-- | meta/recipes-devtools/diffstat/diffstat_1.58.bb (renamed from meta/recipes-devtools/diffstat/diffstat_1.57.bb) | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/meta/recipes-devtools/diffstat/diffstat/aclocal.patch b/meta/recipes-devtools/diffstat/diffstat/aclocal.patch index 37e518f035..ff18f1b31d 100644 --- a/meta/recipes-devtools/diffstat/diffstat/aclocal.patch +++ b/meta/recipes-devtools/diffstat/diffstat/aclocal.patch | |||
@@ -11,11 +11,11 @@ The original macro name (AC_ACVERSION) leads to this error: | |||
11 | Upstream-Status: Inappropriate [embedded specific] | 11 | Upstream-Status: Inappropriate [embedded specific] |
12 | Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com> | 12 | Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com> |
13 | 13 | ||
14 | diff --git a/aclocal.m4 b/aclocal.m4 | 14 | Index: diffstat-1.58/aclocal.m4 |
15 | index 144a074..fce6eba 100644 | 15 | =================================================================== |
16 | --- a/aclocal.m4 | 16 | --- diffstat-1.58.orig/aclocal.m4 2013-10-29 01:43:23.000000000 +0200 |
17 | +++ b/aclocal.m4 | 17 | +++ diffstat-1.58/aclocal.m4 2013-11-04 11:22:53.461562567 +0200 |
18 | @@ -13,15 +13,15 @@ dnl ------------------ | 18 | @@ -13,16 +13,16 @@ |
19 | dnl Conditionally generate script according to whether we're using a given autoconf. | 19 | dnl Conditionally generate script according to whether we're using a given autoconf. |
20 | dnl | 20 | dnl |
21 | dnl $1 = version to compare against | 21 | dnl $1 = version to compare against |
@@ -25,6 +25,7 @@ index 144a074..fce6eba 100644 | |||
25 | +dnl $3 = code to use if AC_AUTOCONF_VERSION is older than $1. | 25 | +dnl $3 = code to use if AC_AUTOCONF_VERSION is older than $1. |
26 | define([CF_ACVERSION_CHECK], | 26 | define([CF_ACVERSION_CHECK], |
27 | [ | 27 | [ |
28 | ifdef([AC_ACVERSION], ,[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])dnl | ||
28 | ifdef([m4_version_compare], | 29 | ifdef([m4_version_compare], |
29 | -[m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])], | 30 | -[m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])], |
30 | +[m4_if(m4_version_compare(m4_defn([AC_AUTOCONF_VERSION]), [$1]), -1, [$3], [$2])], | 31 | +[m4_if(m4_version_compare(m4_defn([AC_AUTOCONF_VERSION]), [$1]), -1, [$3], [$2])], |
diff --git a/meta/recipes-devtools/diffstat/diffstat_1.57.bb b/meta/recipes-devtools/diffstat/diffstat_1.58.bb index c25005f140..8f73bfc5f9 100644 --- a/meta/recipes-devtools/diffstat/diffstat_1.57.bb +++ b/meta/recipes-devtools/diffstat/diffstat_1.58.bb | |||
@@ -11,8 +11,8 @@ SRC_URI = "ftp://invisible-island.net/diffstat/diffstat-${PV}.tgz \ | |||
11 | file://dirfix.patch \ | 11 | file://dirfix.patch \ |
12 | file://aclocal.patch" | 12 | file://aclocal.patch" |
13 | 13 | ||
14 | SRC_URI[md5sum] = "a70ae35e479ab91da7eb6023a4e9240a" | 14 | SRC_URI[md5sum] = "6d6e13f7dcfe4db5da65c5175260ea47" |
15 | SRC_URI[sha256sum] = "cb9845839d695f178d6b5458b08d3e04773e400f35c0c062c4c0102220fba1e6" | 15 | SRC_URI[sha256sum] = "fad5135199c3b9aea132c5d45874248f4ce0ff35f61abb8d03c3b90258713793" |
16 | 16 | ||
17 | S = "${WORKDIR}/diffstat-${PV}" | 17 | S = "${WORKDIR}/diffstat-${PV}" |
18 | 18 | ||