summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2018-05-15 17:17:01 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-22 13:13:32 +0100
commit7ccd4a201c13a94f3af1bbf8d48ccb311e86b03b (patch)
treeff29fe05e1e62b9355901e02bc80b6fcdd9e52db
parent75081c0ab6e93c0d941804bfa1bd0bc10e057866 (diff)
downloadpoky-7ccd4a201c13a94f3af1bbf8d48ccb311e86b03b.tar.gz
diffstat: fix wrong evaluation of CC
diffstat checks variable CC. If options '-I', '-U' or '-D' is included in CC, variable CC will be wrongly filtered and only such as 'mips64-wrsmllibn32-linux-gnun32-gcc' left. It shows warning message during configure: | checking $CC variable...broken | configure: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options Disable such check for OE. (From OE-Core rev: c330036e1e6151246b736f88f7412e9e4ac38d5f) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/diffstat/diffstat/avoid-check-user-break-cc.patch26
-rw-r--r--meta/recipes-devtools/diffstat/diffstat_1.61.bb1
2 files changed, 27 insertions, 0 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
new file mode 100644
index 0000000000..2df2d00185
--- /dev/null
+++ b/meta/recipes-devtools/diffstat/diffstat/avoid-check-user-break-cc.patch
@@ -0,0 +1,26 @@
1Upstream-Status: Inappropriate [oe specific]
2
3m4 function CF_CC_ENV_FLAGS checks whether variable CC contains options '-I', '-U'
4and '-D'. It is not suitable for oe that option such as '-D_FORTIFY_SOURCE=2' may
5be included in CC. And then CC will be wrongly filtered.
6
7So comment out CF_CC_ENV_FLAGS from function CF_PROG_CC.
8
9Signed-off-by: Kai Kang <kai.kang@windriver.com>
10---
11 aclocal.m4 | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/aclocal.m4 b/aclocal.m4
15index 420fe83..eb73ea9 100644
16--- a/aclocal.m4
17+++ b/aclocal.m4
18@@ -1114,7 +1114,7 @@ CF_GCC_VERSION
19 CF_ACVERSION_CHECK(2.52,
20 [AC_PROG_CC_STDC],
21 [CF_ANSI_CC_REQD])
22-CF_CC_ENV_FLAGS
23+dnl CF_CC_ENV_FLAGS
24 ])dnl
25 dnl ---------------------------------------------------------------------------
26 dnl CF_PROG_GROFF version: 2 updated: 2015/07/04 11:16:27
diff --git a/meta/recipes-devtools/diffstat/diffstat_1.61.bb b/meta/recipes-devtools/diffstat/diffstat_1.61.bb
index f8b7b06cf2..1a76e78c15 100644
--- a/meta/recipes-devtools/diffstat/diffstat_1.61.bb
+++ b/meta/recipes-devtools/diffstat/diffstat_1.61.bb
@@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://install-sh;endline=42;md5=b3549726c1022bee09c174c72a0
9 9
10SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ 10SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \
11 file://run-ptest \ 11 file://run-ptest \
12 file://avoid-check-user-break-cc.patch \
12" 13"
13 14
14SRC_URI[md5sum] = "c048a32d55d8bd6724f382baf41f325f" 15SRC_URI[md5sum] = "c048a32d55d8bd6724f382baf41f325f"