summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2018-08-23 16:11:21 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-23 18:02:23 +0100
commit66452579a1e6bcebd9b2831253fa004a4e4959d6 (patch)
tree2a2c6e7c9daab4de3d3c75c0e29aaf9748c6e7de
parent6b1f8224454f1e0702cf30890cca2d3ef5c25aab (diff)
downloadpoky-66452579a1e6bcebd9b2831253fa004a4e4959d6.tar.gz
diffstat: 1.61 -> 1.62
Refresh avoid-check-user-break-cc.patch to fix fuzz warning. (From OE-Core rev: 6d9ab12ac113f0f33289200ca3c9df24d9fc1cc2) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/diffstat/diffstat/avoid-check-user-break-cc.patch12
-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 @@
1From 1046593aacb74ff888a0d68c0ff89b20c4bc9ed4 Mon Sep 17 00:00:00 2001
2From: Kai Kang <kai.kang@windriver.com>
3Date: Tue, 15 May 2018 17:17:01 +0800
4Subject: [PATCH] diffstat: fix wrong evaluation of CC
5
1Upstream-Status: Inappropriate [oe specific] 6Upstream-Status: Inappropriate [oe specific]
2 7
3m4 function CF_CC_ENV_FLAGS checks whether variable CC contains options '-I', '-U' 8m4 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.
7So comment out CF_CC_ENV_FLAGS from function CF_PROG_CC. 12So comment out CF_CC_ENV_FLAGS from function CF_PROG_CC.
8 13
9Signed-off-by: Kai Kang <kai.kang@windriver.com> 14Signed-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
14diff --git a/aclocal.m4 b/aclocal.m4 20diff --git a/aclocal.m4 b/aclocal.m4
15index 420fe83..eb73ea9 100644 21index 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
15SRC_URI[md5sum] = "c048a32d55d8bd6724f382baf41f325f" 15SRC_URI[md5sum] = "91e106bb34cb097750db7ddc0ba1d8fc"
16SRC_URI[sha256sum] = "25359e0c27183f997b36c9202583b5dc2df390c20e22a92606af4bf7856a55ee" 16SRC_URI[sha256sum] = "7f09183644ed77a156b15346bbad4e89c93543e140add9dab18747e30522591f"
17 17
18S = "${WORKDIR}/diffstat-${PV}" 18S = "${WORKDIR}/diffstat-${PV}"
19 19