diff options
| author | Chen Qi <Qi.Chen@windriver.com> | 2018-03-01 00:01:19 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-20 09:30:19 +0000 |
| commit | 4871d3c2b6dd6c07a2adcfbc9ecfb22e4afa2d0d (patch) | |
| tree | d2a74e635f25491efa50260e205e242547c79cec | |
| parent | 906230a73b3ccfa4afd2a19a6b0aa18cd1d5fa08 (diff) | |
| download | openembedded-core-4871d3c2b6dd6c07a2adcfbc9ecfb22e4afa2d0d.tar.gz openembedded-core-4871d3c2b6dd6c07a2adcfbc9ecfb22e4afa2d0d.tar.bz2 openembedded-core-4871d3c2b6dd6c07a2adcfbc9ecfb22e4afa2d0d.zip | |
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'
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
| -rw-r--r-- | meta/recipes-core/systemd/systemd/0001-Remove-fstack-protector-flags-to-workaround-musl-bui.patch | 33 | ||||
| -rw-r--r-- | meta/recipes-core/systemd/systemd_237.bb | 4 |
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 @@ +From e361f6b4aefae57efff7e457df8db4d1067bec23 Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Wed, 28 Feb 2018 21:50:23 -0800 +Subject: [PATCH] Remove fstack-protector flags to workaround musl build + +Remove fstack-protector and fstack-protector-strong flags to fix +the following build failure for qemux86 and qemuppc with musl. + + undefined reference to `__stack_chk_fail_local' + +Upstream-Status: Inappropriate [OE Specific] + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 7610ab12b..591b9cbab 100644 +--- a/meson.build ++++ b/meson.build +@@ -329,8 +329,6 @@ foreach arg : ['-Wextra', + '-fdiagnostics-show-option', + '-fno-strict-aliasing', + '-fvisibility=hidden', +- '-fstack-protector', +- '-fstack-protector-strong', + '--param=ssp-buffer-size=4', + ] + if cc.has_argument(arg) +-- +2.13.0 + 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 \ " SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch" +# Workaround undefined reference to `__stack_chk_fail_local' on qemux86 and qemuppc for musl +SRC_URI_append_libc-musl_qemux86 = " file://0001-Remove-fstack-protector-flags-to-workaround-musl-bui.patch" +SRC_URI_append_libc-musl_qemuppc = " file://0001-Remove-fstack-protector-flags-to-workaround-musl-bui.patch" + PAM_PLUGINS = " \ pam-plugin-unix \ pam-plugin-loginuid \ |