From 1b16364d8d3e9dff8f573a39fcefd690017e29f9 Mon Sep 17 00:00:00 2001 From: yuncang123 <1050706328@qq.com> Date: Sun, 15 Sep 2024 01:34:48 +0800 Subject: [PATCH] fix error of cc.compiles in meson.build on aarch cased by '-fstack-clash-protection' and '-Werror' --- 0017-fix-error-of-cc.compiles-on-aarch.patch | 25 ++++++++++++++++++++ lxc.spec | 9 ++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 0017-fix-error-of-cc.compiles-on-aarch.patch diff --git a/0017-fix-error-of-cc.compiles-on-aarch.patch b/0017-fix-error-of-cc.compiles-on-aarch.patch new file mode 100644 index 0000000..6a56e40 --- /dev/null +++ b/0017-fix-error-of-cc.compiles-on-aarch.patch @@ -0,0 +1,25 @@ +From 65c409ce619fe9be4405c7148d697ed8dae78eae Mon Sep 17 00:00:00 2001 +From: yuncang123 <1050706328@qq.com> +Date: Sat, 14 Sep 2024 23:44:36 +0800 +Subject: [PATCH] fix + +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 1b2d673..6ae2f18 100644 +--- a/meson.build ++++ b/meson.build +@@ -538,7 +538,7 @@ int func (void) { + } + ''' + +-have_func_strerror_r_char_p = cc.compiles(code, name : 'strerror_r() returns char *') ++have_func_strerror_r_char_p = cc.compiles(code, args : '-Wno-error=unused-command-line-argument', name : 'strerror_r() returns char *') + endif + + srcconf.set10('STRERROR_R_CHAR_P', have_func_strerror_r_char_p) +-- +2.43.0 + diff --git a/lxc.spec b/lxc.spec index 6bdfc7d..c538ad2 100644 --- a/lxc.spec +++ b/lxc.spec @@ -1,4 +1,4 @@ -%global _release 15 +%global _release 16 %bcond isulad 1 Name: lxc @@ -25,6 +25,7 @@ Patch0013: 0013-ensure-cpuset-cgroup-built-while-writing-cgroup.proc.patch Patch0014: 0014-fix-cpuset-cgroup-error.patch Patch0015: 0015-append-mntopt-to-mntdata-if-not-found-in-mount_opt.patch Patch0016: 0016-unfreeze-freezing-container-and-bugfix-for-files.lim.patch +Patch0017: 0017-fix-error-of-cc.compiles-on-aarch.patch BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath BuildRequires: pkgconfig(libseccomp) @@ -214,6 +215,12 @@ meson test -C build %endif %changelog +* Sun Sep 15 2024 yuanchao <1050706328@qq.com> - 5.0.2-16 +- Type: bugfix +- ID:NA +- SUG:NA +- DESC: fix error of cc.compiles in meson.build on aarch cased by '-fstack-clash-protection' and '-Werror' + * Mon Jul 29 2024 jikai - 5.0.2-15 - Type: bugfix - ID:NA -- Gitee