diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-10-14 08:48:58 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-04 17:23:55 +0000 |
commit | 221c4877f1ea920627196e716a6327a3e398aa27 (patch) | |
tree | 95577576a85ef0276e244a00d5bc1b0c570a8cae | |
parent | e303b3cadc495d02ccdd4cf25f24ee8512dc729b (diff) | |
download | poky-221c4877f1ea920627196e716a6327a3e398aa27.tar.gz |
mdadm: Fix build with gcc < 7
Do not rely on build host gcc for "implicit-fallthrough" support
we need to check the CC for it
(From OE-Core rev: 8dae7b56b85e098eda1517eb7f50f37c57fb3ba6)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
(cherry picked from commit b36100bb3077947361c858f891eb15a76013671e)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-extended/mdadm/files/0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch | 31 | ||||
-rw-r--r-- | meta/recipes-extended/mdadm/mdadm_4.0.bb | 1 |
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-extended/mdadm/files/0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch b/meta/recipes-extended/mdadm/files/0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch new file mode 100644 index 0000000000..a4b7b8acd3 --- /dev/null +++ b/meta/recipes-extended/mdadm/files/0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From a129ee6d80f3b2cda0d827c35fa81a517cf6d505 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 13 Oct 2017 10:27:34 -0700 | ||
4 | Subject: [PATCH] Use CC to check for implicit-fallthrough warning support | ||
5 | |||
6 | This warning it new in gcc7 and in cross compile case | ||
7 | its possible that build host gcc is version 7+ but the | ||
8 | cross compile used for compiling mdadm is < version 7 | ||
9 | |||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | Upstream-Status: Pending | ||
13 | Makefile | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/Makefile b/Makefile | ||
17 | index d207ee4..971f255 100644 | ||
18 | --- a/Makefile | ||
19 | +++ b/Makefile | ||
20 | @@ -48,7 +48,7 @@ ifdef WARN_UNUSED | ||
21 | CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O3 | ||
22 | endif | ||
23 | |||
24 | -FALLTHROUGH := $(shell gcc -v --help 2>&1 | grep "implicit-fallthrough" | wc -l) | ||
25 | +FALLTHROUGH := $(shell ${CC} -v --help 2>&1 | grep "implicit-fallthrough" | wc -l) | ||
26 | ifneq "$(FALLTHROUGH)" "0" | ||
27 | CWFLAGS += -Wimplicit-fallthrough=0 | ||
28 | endif | ||
29 | -- | ||
30 | 2.14.2 | ||
31 | |||
diff --git a/meta/recipes-extended/mdadm/mdadm_4.0.bb b/meta/recipes-extended/mdadm/mdadm_4.0.bb index 506b0bc315..dc098f19b6 100644 --- a/meta/recipes-extended/mdadm/mdadm_4.0.bb +++ b/meta/recipes-extended/mdadm/mdadm_4.0.bb | |||
@@ -21,6 +21,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \ | |||
21 | file://0003-Replace-snprintf-with-strncpy-at-some-places-to-avoi.patch \ | 21 | file://0003-Replace-snprintf-with-strncpy-at-some-places-to-avoi.patch \ |
22 | file://0004-mdadm-Forced-type-conversion-to-avoid-truncation.patch \ | 22 | file://0004-mdadm-Forced-type-conversion-to-avoid-truncation.patch \ |
23 | file://0005-Add-a-comment-to-indicate-valid-fallthrough.patch \ | 23 | file://0005-Add-a-comment-to-indicate-valid-fallthrough.patch \ |
24 | file://0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch \ | ||
24 | " | 25 | " |
25 | SRC_URI[md5sum] = "2cb4feffea9167ba71b5f346a0c0a40d" | 26 | SRC_URI[md5sum] = "2cb4feffea9167ba71b5f346a0c0a40d" |
26 | SRC_URI[sha256sum] = "1d6ae7f24ced3a0fa7b5613b32f4a589bb4881e3946a5a2c3724056254ada3a9" | 27 | SRC_URI[sha256sum] = "1d6ae7f24ced3a0fa7b5613b32f4a589bb4881e3946a5a2c3724056254ada3a9" |