summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2018-03-01 00:01:19 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-20 09:59:33 +0000
commitaacaf836ba7d53590ea9a3bd76bab16d02c9ffbb (patch)
tree8c9d69f2ec22b9d817dda037c9aeb1efd1818915 /meta
parent40db00818e3b1cce8aa85ee30f3081ae9a5f8e66 (diff)
downloadpoky-aacaf836ba7d53590ea9a3bd76bab16d02c9ffbb.tar.gz
systemd: fix build failure for qemux86 and qemuppc with musl
Remove the 'fstack-protector' and 'fstack-protector-strong' flags as a workaround to fix the following error when building for qemux86 and qemuppc with musl. undefined reference to `__stack_chk_fail_local' (From OE-Core rev: 4871d3c2b6dd6c07a2adcfbc9ecfb22e4afa2d0d) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/systemd/systemd/0001-Remove-fstack-protector-flags-to-workaround-musl-bui.patch33
-rw-r--r--meta/recipes-core/systemd/systemd_237.bb4
2 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-Remove-fstack-protector-flags-to-workaround-musl-bui.patch b/meta/recipes-core/systemd/systemd/0001-Remove-fstack-protector-flags-to-workaround-musl-bui.patch
new file mode 100644
index 0000000000..e913e3f7b5
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0001-Remove-fstack-protector-flags-to-workaround-musl-bui.patch
@@ -0,0 +1,33 @@
1From e361f6b4aefae57efff7e457df8db4d1067bec23 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Wed, 28 Feb 2018 21:50:23 -0800
4Subject: [PATCH] Remove fstack-protector flags to workaround musl build
5
6Remove fstack-protector and fstack-protector-strong flags to fix
7the following build failure for qemux86 and qemuppc with musl.
8
9 undefined reference to `__stack_chk_fail_local'
10
11Upstream-Status: Inappropriate [OE Specific]
12
13Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
14---
15 meson.build | 2 --
16 1 file changed, 2 deletions(-)
17
18diff --git a/meson.build b/meson.build
19index 7610ab12b..591b9cbab 100644
20--- a/meson.build
21+++ b/meson.build
22@@ -329,8 +329,6 @@ foreach arg : ['-Wextra',
23 '-fdiagnostics-show-option',
24 '-fno-strict-aliasing',
25 '-fvisibility=hidden',
26- '-fstack-protector',
27- '-fstack-protector-strong',
28 '--param=ssp-buffer-size=4',
29 ]
30 if cc.has_argument(arg)
31--
322.13.0
33
diff --git a/meta/recipes-core/systemd/systemd_237.bb b/meta/recipes-core/systemd/systemd_237.bb
index 8ef1026086..ecf8e74940 100644
--- a/meta/recipes-core/systemd/systemd_237.bb
+++ b/meta/recipes-core/systemd/systemd_237.bb
@@ -52,6 +52,10 @@ SRC_URI += "file://touchscreen.rules \
52 " 52 "
53SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch" 53SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch"
54 54
55# Workaround undefined reference to `__stack_chk_fail_local' on qemux86 and qemuppc for musl
56SRC_URI_append_libc-musl_qemux86 = " file://0001-Remove-fstack-protector-flags-to-workaround-musl-bui.patch"
57SRC_URI_append_libc-musl_qemuppc = " file://0001-Remove-fstack-protector-flags-to-workaround-musl-bui.patch"
58
55PAM_PLUGINS = " \ 59PAM_PLUGINS = " \
56 pam-plugin-unix \ 60 pam-plugin-unix \
57 pam-plugin-loginuid \ 61 pam-plugin-loginuid \