diff options
Diffstat (limited to 'poky/meta/recipes-devtools/diffstat')
| -rw-r--r-- | poky/meta/recipes-devtools/diffstat/diffstat/avoid-check-user-break-cc.patch | 32 | ||||
| -rw-r--r-- | poky/meta/recipes-devtools/diffstat/diffstat_1.62.bb (renamed from poky/meta/recipes-devtools/diffstat/diffstat_1.61.bb) | 5 |
2 files changed, 35 insertions, 2 deletions
diff --git a/poky/meta/recipes-devtools/diffstat/diffstat/avoid-check-user-break-cc.patch b/poky/meta/recipes-devtools/diffstat/diffstat/avoid-check-user-break-cc.patch new file mode 100644 index 000000000..811faa48d --- /dev/null +++ b/poky/meta/recipes-devtools/diffstat/diffstat/avoid-check-user-break-cc.patch @@ -0,0 +1,32 @@ +From 1046593aacb74ff888a0d68c0ff89b20c4bc9ed4 Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Tue, 15 May 2018 17:17:01 +0800 +Subject: [PATCH] diffstat: fix wrong evaluation of CC + +Upstream-Status: Inappropriate [oe specific] + +m4 function CF_CC_ENV_FLAGS checks whether variable CC contains options '-I', '-U' +and '-D'. It is not suitable for oe that option such as '-D_FORTIFY_SOURCE=2' may +be included in CC. And then CC will be wrongly filtered. + +So comment out CF_CC_ENV_FLAGS from function CF_PROG_CC. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + +--- + aclocal.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index 9281aa8..dd57b7a 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -1239,7 +1239,7 @@ CF_GCC_VERSION + CF_ACVERSION_CHECK(2.52, + [AC_PROG_CC_STDC], + [CF_ANSI_CC_REQD]) +-CF_CC_ENV_FLAGS ++dnl CF_CC_ENV_FLAGS + ])dnl + dnl --------------------------------------------------------------------------- + dnl CF_PROG_GROFF version: 3 updated: 2018/01/07 13:16:19 diff --git a/poky/meta/recipes-devtools/diffstat/diffstat_1.61.bb b/poky/meta/recipes-devtools/diffstat/diffstat_1.62.bb index f8b7b06cf..93d77797c 100644 --- a/poky/meta/recipes-devtools/diffstat/diffstat_1.61.bb +++ b/poky/meta/recipes-devtools/diffstat/diffstat_1.62.bb @@ -9,10 +9,11 @@ LIC_FILES_CHKSUM = "file://install-sh;endline=42;md5=b3549726c1022bee09c174c72a0 SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ file://run-ptest \ + file://avoid-check-user-break-cc.patch \ " -SRC_URI[md5sum] = "c048a32d55d8bd6724f382baf41f325f" -SRC_URI[sha256sum] = "25359e0c27183f997b36c9202583b5dc2df390c20e22a92606af4bf7856a55ee" +SRC_URI[md5sum] = "91e106bb34cb097750db7ddc0ba1d8fc" +SRC_URI[sha256sum] = "7f09183644ed77a156b15346bbad4e89c93543e140add9dab18747e30522591f" S = "${WORKDIR}/diffstat-${PV}" |