diff options
-rw-r--r-- | meta/recipes-devtools/diffstat/diffstat/avoid-check-user-break-cc.patch | 12 | ||||
-rw-r--r-- | meta/recipes-devtools/diffstat/diffstat_1.62.bb (renamed from meta/recipes-devtools/diffstat/diffstat_1.61.bb) | 4 |
2 files changed, 11 insertions, 5 deletions
diff --git a/meta/recipes-devtools/diffstat/diffstat/avoid-check-user-break-cc.patch b/meta/recipes-devtools/diffstat/diffstat/avoid-check-user-break-cc.patch index 2df2d00185..811faa48da 100644 --- a/meta/recipes-devtools/diffstat/diffstat/avoid-check-user-break-cc.patch +++ b/meta/recipes-devtools/diffstat/diffstat/avoid-check-user-break-cc.patch | |||
@@ -1,3 +1,8 @@ | |||
1 | From 1046593aacb74ff888a0d68c0ff89b20c4bc9ed4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Kai Kang <kai.kang@windriver.com> | ||
3 | Date: Tue, 15 May 2018 17:17:01 +0800 | ||
4 | Subject: [PATCH] diffstat: fix wrong evaluation of CC | ||
5 | |||
1 | Upstream-Status: Inappropriate [oe specific] | 6 | Upstream-Status: Inappropriate [oe specific] |
2 | 7 | ||
3 | m4 function CF_CC_ENV_FLAGS checks whether variable CC contains options '-I', '-U' | 8 | m4 function CF_CC_ENV_FLAGS checks whether variable CC contains options '-I', '-U' |
@@ -7,15 +12,16 @@ be included in CC. And then CC will be wrongly filtered. | |||
7 | So comment out CF_CC_ENV_FLAGS from function CF_PROG_CC. | 12 | So comment out CF_CC_ENV_FLAGS from function CF_PROG_CC. |
8 | 13 | ||
9 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | 14 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
15 | |||
10 | --- | 16 | --- |
11 | aclocal.m4 | 2 +- | 17 | aclocal.m4 | 2 +- |
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | 18 | 1 file changed, 1 insertion(+), 1 deletion(-) |
13 | 19 | ||
14 | diff --git a/aclocal.m4 b/aclocal.m4 | 20 | diff --git a/aclocal.m4 b/aclocal.m4 |
15 | index 420fe83..eb73ea9 100644 | 21 | index 9281aa8..dd57b7a 100644 |
16 | --- a/aclocal.m4 | 22 | --- a/aclocal.m4 |
17 | +++ b/aclocal.m4 | 23 | +++ b/aclocal.m4 |
18 | @@ -1114,7 +1114,7 @@ CF_GCC_VERSION | 24 | @@ -1239,7 +1239,7 @@ CF_GCC_VERSION |
19 | CF_ACVERSION_CHECK(2.52, | 25 | CF_ACVERSION_CHECK(2.52, |
20 | [AC_PROG_CC_STDC], | 26 | [AC_PROG_CC_STDC], |
21 | [CF_ANSI_CC_REQD]) | 27 | [CF_ANSI_CC_REQD]) |
@@ -23,4 +29,4 @@ index 420fe83..eb73ea9 100644 | |||
23 | +dnl CF_CC_ENV_FLAGS | 29 | +dnl CF_CC_ENV_FLAGS |
24 | ])dnl | 30 | ])dnl |
25 | dnl --------------------------------------------------------------------------- | 31 | dnl --------------------------------------------------------------------------- |
26 | dnl CF_PROG_GROFF version: 2 updated: 2015/07/04 11:16:27 | 32 | dnl CF_PROG_GROFF version: 3 updated: 2018/01/07 13:16:19 |
diff --git a/meta/recipes-devtools/diffstat/diffstat_1.61.bb b/meta/recipes-devtools/diffstat/diffstat_1.62.bb index 1a76e78c15..93d77797c9 100644 --- a/meta/recipes-devtools/diffstat/diffstat_1.61.bb +++ b/meta/recipes-devtools/diffstat/diffstat_1.62.bb | |||
@@ -12,8 +12,8 @@ SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ | |||
12 | file://avoid-check-user-break-cc.patch \ | 12 | file://avoid-check-user-break-cc.patch \ |
13 | " | 13 | " |
14 | 14 | ||
15 | SRC_URI[md5sum] = "c048a32d55d8bd6724f382baf41f325f" | 15 | SRC_URI[md5sum] = "91e106bb34cb097750db7ddc0ba1d8fc" |
16 | SRC_URI[sha256sum] = "25359e0c27183f997b36c9202583b5dc2df390c20e22a92606af4bf7856a55ee" | 16 | SRC_URI[sha256sum] = "7f09183644ed77a156b15346bbad4e89c93543e140add9dab18747e30522591f" |
17 | 17 | ||
18 | S = "${WORKDIR}/diffstat-${PV}" | 18 | S = "${WORKDIR}/diffstat-${PV}" |
19 | 19 | ||