From c94aad4a40ea4a3555cc00d88732afce9655c7b6 Mon Sep 17 00:00:00 2001 From: WangFengTu Date: Wed, 29 Dec 2021 10:19:18 +0800 Subject: [PATCH] fix compile error Signed-off-by: WangFengTu --- ...f-gcc-compilation-optimization-level.patch | 26 +++++++++++++++++++ lcr.spec | 22 +++++++++++----- 2 files changed, 41 insertions(+), 7 deletions(-) create mode 100644 0007-fix-the-error-of-gcc-compilation-optimization-level.patch diff --git a/0007-fix-the-error-of-gcc-compilation-optimization-level.patch b/0007-fix-the-error-of-gcc-compilation-optimization-level.patch new file mode 100644 index 0000000..7dd0625 --- /dev/null +++ b/0007-fix-the-error-of-gcc-compilation-optimization-level.patch @@ -0,0 +1,26 @@ +From 312ac2de6c5b1f7ea446c968f30139149810318b Mon Sep 17 00:00:00 2001 +From: wujing +Date: Thu, 9 Dec 2021 10:30:45 +0800 +Subject: [PATCH] fix the error of gcc compilation optimization level + +Signed-off-by: wujing +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5222555..557ac34 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -30,7 +30,7 @@ endif() + + option(DEBUG "set lcr gcc option" ON) + if (DEBUG STREQUAL "ON") +- add_definitions("-g -o2") ++ add_definitions("-g -O2") + endif() + + option(ENABLE_UT "enable ut" OFF) +-- +2.25.1 + diff --git a/lcr.spec b/lcr.spec index 445dd74..b49858e 100644 --- a/lcr.spec +++ b/lcr.spec @@ -1,5 +1,5 @@ %global _version 2.0.6 -%global _release 7 +%global _release 8 %global _inner_name isula_libutils Name: lcr @@ -12,12 +12,13 @@ Group: Applications/System License: LGPLv2.1+ BuildRoot: %{_tmppath}/lcr-%{version} -Patch1: 0001-modified-ipconfig.json-to-adapt-to-newest-version-of.patch -Patch2: 0002-disable-lxc_keep-with-oci-image.patch -Patch3: 0003-add-self-def-runtime-for-shimv2.patch -Patch4: 0004-move-cri-runtimes-to-daemon.patch -Patch5: 0005-config-v2-and-inspect-were-modified-to-support-modif.patch -Patch6: 0006-support-null-value-in-json.patch +Patch0001: 0001-modified-ipconfig.json-to-adapt-to-newest-version-of.patch +Patch0002: 0002-disable-lxc_keep-with-oci-image.patch +Patch0003: 0003-add-self-def-runtime-for-shimv2.patch +Patch0004: 0004-move-cri-runtimes-to-daemon.patch +Patch0005: 0005-config-v2-and-inspect-were-modified-to-support-modif.patch +Patch0006: 0006-support-null-value-in-json.patch +Patch0007: 0007-fix-the-error-of-gcc-compilation-optimization-level.patch %define lxcver 4.0.3-2021112501 @@ -106,11 +107,18 @@ rm -rf %{buildroot} %{_includedir}/%{_inner_name}/*.h %changelog +* Wed Dec 29 2021 wangfengtu - 2.0.6-8 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: fix compile error + * Mon Dec 06 2021 gaohuatao - 2.0.6-7 - Type:enhancement - ID:NA - SUG:NA - DESC: specify version + * Wed Nov 24 2021 haozi007 - 2.0.6-6 - Type:enhancement - ID:NA