!123 fix compile error

Merge pull request !123 from wangfengtu/fix_compile_master
This commit is contained in:
openeuler-ci-bot 2021-12-29 03:00:43 +00:00 committed by Gitee
commit 90ba9b2094
2 changed files with 41 additions and 7 deletions

View File

@ -0,0 +1,26 @@
From 312ac2de6c5b1f7ea446c968f30139149810318b Mon Sep 17 00:00:00 2001
From: wujing <wujing50@huawei.com>
Date: Thu, 9 Dec 2021 10:30:45 +0800
Subject: [PATCH] fix the error of gcc compilation optimization level
Signed-off-by: wujing <wujing50@huawei.com>
---
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

View File

@ -1,5 +1,5 @@
%global _version 2.0.6 %global _version 2.0.6
%global _release 7 %global _release 8
%global _inner_name isula_libutils %global _inner_name isula_libutils
Name: lcr Name: lcr
@ -12,12 +12,13 @@ Group: Applications/System
License: LGPLv2.1+ License: LGPLv2.1+
BuildRoot: %{_tmppath}/lcr-%{version} BuildRoot: %{_tmppath}/lcr-%{version}
Patch1: 0001-modified-ipconfig.json-to-adapt-to-newest-version-of.patch Patch0001: 0001-modified-ipconfig.json-to-adapt-to-newest-version-of.patch
Patch2: 0002-disable-lxc_keep-with-oci-image.patch Patch0002: 0002-disable-lxc_keep-with-oci-image.patch
Patch3: 0003-add-self-def-runtime-for-shimv2.patch Patch0003: 0003-add-self-def-runtime-for-shimv2.patch
Patch4: 0004-move-cri-runtimes-to-daemon.patch Patch0004: 0004-move-cri-runtimes-to-daemon.patch
Patch5: 0005-config-v2-and-inspect-were-modified-to-support-modif.patch Patch0005: 0005-config-v2-and-inspect-were-modified-to-support-modif.patch
Patch6: 0006-support-null-value-in-json.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 %define lxcver 4.0.3-2021112501
@ -106,11 +107,18 @@ rm -rf %{buildroot}
%{_includedir}/%{_inner_name}/*.h %{_includedir}/%{_inner_name}/*.h
%changelog %changelog
* Wed Dec 29 2021 wangfengtu <wangfengtu@huawei.com> - 2.0.6-8
- Type:bugfix
- ID:NA
- SUG:NA
- DESC: fix compile error
* Mon Dec 06 2021 gaohuatao <gaohuatao@huawei.com> - 2.0.6-7 * Mon Dec 06 2021 gaohuatao <gaohuatao@huawei.com> - 2.0.6-7
- Type:enhancement - Type:enhancement
- ID:NA - ID:NA
- SUG:NA - SUG:NA
- DESC: specify version - DESC: specify version
* Wed Nov 24 2021 haozi007 <liuhao27@huawei.com> - 2.0.6-6 * Wed Nov 24 2021 haozi007 <liuhao27@huawei.com> - 2.0.6-6
- Type:enhancement - Type:enhancement
- ID:NA - ID:NA