diff --git a/0035-adapt-upstream-compiler-settings.patch b/0035-adapt-upstream-compiler-settings.patch new file mode 100644 index 0000000000000000000000000000000000000000..fce34bd6145fc5c6166cb586e07bbcdf560908b8 --- /dev/null +++ b/0035-adapt-upstream-compiler-settings.patch @@ -0,0 +1,29 @@ +From d65cefcee3dce74a970239d38dcb4e491cb38b70 Mon Sep 17 00:00:00 2001 +From: haozi007 +Date: Mon, 27 Dec 2021 09:23:44 +0000 +Subject: [PATCH] adapt upstream compiler settings + +Signed-off-by: haozi007 +--- + configure.ac | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 9eb6dcb..d1d793b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -761,6 +761,11 @@ AX_CHECK_COMPILE_FLAG([-Wnested-externs], [CFLAGS="$CFLAGS -Wnested-externs"],,[ + AX_CHECK_COMPILE_FLAG([-fasynchronous-unwind-tables], [CFLAGS="$CFLAGS -fasynchronous-unwind-tables"],,[-Werror]) + AX_CHECK_COMPILE_FLAG([-pipe], [CFLAGS="$CFLAGS -pipe"],,[-Werror]) + AX_CHECK_COMPILE_FLAG([-fexceptions], [CFLAGS="$CFLAGS -fexceptions"],,[-Werror]) ++AX_CHECK_COMPILE_FLAG([-g], [CFLAGS="$CFLAGS -g"],,[-Werror]) ++AX_CHECK_COMPILE_FLAG([-Warray-bounds], [CFLAGS="$CFLAGS -Warray-bounds"],,[-Werror]) ++AX_CHECK_COMPILE_FLAG([-Wrestrict], [CFLAGS="$CFLAGS -Wrestrict"],,[-Werror]) ++AX_CHECK_COMPILE_FLAG([-Wreturn-local-addr], [CFLAGS="$CFLAGS -Wreturn-local-addr"],,[-Werror]) ++AX_CHECK_COMPILE_FLAG([-Wstringop-overflow], [CFLAGS="$CFLAGS -Wstringop-overflow"],,[-Werror]) + + AX_CHECK_LINK_FLAG([-z relro], [LDFLAGS="$LDFLAGS -z relro"],,[]) + AX_CHECK_LINK_FLAG([-z now], [LDFLAGS="$LDFLAGS -z now"],,[]) +-- +2.20.1 + diff --git a/lxc.spec b/lxc.spec index b88a005c4f5dc1521c62fe63f8d9c321b7737082..37a3012108c280bc73d8915b80bd6f2b792d2304 100644 --- a/lxc.spec +++ b/lxc.spec @@ -1,4 +1,4 @@ -%global _release 2021112501 +%global _release 2021122701 Name: lxc Version: 4.0.3 @@ -42,6 +42,7 @@ Patch0031: 0031-fix-lsm_se_mount_context-memory-leak.patch Patch0032: 0032-disable-lxc_keep-with-oci-image.patch Patch0033: 0033-conf-ensure-that-the-idmap-pointer-itself-is-freed.patch Patch0034: 0034-cgfsng-fix-cgroup-attach-cgroup-creation.patch +Patch0035: 0035-adapt-upstream-compiler-settings.patch BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath BuildRequires: pkgconfig(libseccomp) @@ -213,6 +214,12 @@ make check %{_mandir}/*/man7/%{name}* %changelog +* Mon Dec 27 2021 haozi007 - 4.0.3-2021122701 +- Type:improve +- ID:NA +- SUG:NA +- DESC:adapt upstream compiler settings + * Thu Nov 25 2021 wangfengtu - 4.0.3-2021112501 - Type:bugfix - ID:NA diff --git a/series.conf b/series.conf index cffc900d9cd8e746c18bbbbfb7645618624927eb..86c71d57acace74555377b08063dba3c7b26719c 100644 --- a/series.conf +++ b/series.conf @@ -32,3 +32,4 @@ 0032-disable-lxc_keep-with-oci-image.patch 0033-conf-ensure-that-the-idmap-pointer-itself-is-freed.patch 0034-cgfsng-fix-cgroup-attach-cgroup-creation.patch +0035-adapt-upstream-compiler-settings.patch