58 lines
1.8 KiB
Diff
58 lines
1.8 KiB
Diff
|
From 92ded2cf442878a3d387f6d3f79e74595c785790 Mon Sep 17 00:00:00 2001
|
||
|
|
From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
|
||
|
|
Date: Tue, 7 Feb 2023 14:57:40 +0800
|
||
|
|
Subject: [PATCH] modify liblcr to libisula
|
||
|
|
|
||
|
|
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
|
||
|
|
---
|
||
|
|
CMakeLists.txt | 2 +-
|
||
|
|
clibcni.spec | 4 ++--
|
||
|
|
cmake/checker.cmake | 2 +-
|
||
|
|
3 files changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index f87de1d..c2c5b13 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -56,7 +56,7 @@ else()
|
||
|
|
set(LIB_INSTALL_DIR_DEFAULT "lib")
|
||
|
|
endif()
|
||
|
|
|
||
|
|
-# set liblcr compile flags
|
||
|
|
+# set libisula compile flags
|
||
|
|
if (CLIBCNI_GCOV)
|
||
|
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COVERAGE_OPTION} -fprofile-arcs -ftest-coverage -fkeep-static-functions -fkeep-inline-functions")
|
||
|
|
message("------compile with gcov-------------")
|
||
|
|
diff --git a/clibcni.spec b/clibcni.spec
|
||
|
|
index 7ec45d1..3e9de91 100644
|
||
|
|
--- a/clibcni.spec
|
||
|
|
+++ b/clibcni.spec
|
||
|
|
@@ -12,9 +12,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}
|
||
|
|
|
||
|
|
BuildRequires: gcc
|
||
|
|
BuildRequires: cmake
|
||
|
|
-BuildRequires: lcr-devel yajl-devel gtest-devel
|
||
|
|
+BuildRequires: libisula-devel yajl-devel gtest-devel
|
||
|
|
|
||
|
|
-Requires: lcr
|
||
|
|
+Requires: libisula
|
||
|
|
|
||
|
|
%ifarch x86_64 aarch64
|
||
|
|
Provides: lib%{name}.so()(64bit)
|
||
|
|
diff --git a/cmake/checker.cmake b/cmake/checker.cmake
|
||
|
|
index 4198c94..85d2b9a 100644
|
||
|
|
--- a/cmake/checker.cmake
|
||
|
|
+++ b/cmake/checker.cmake
|
||
|
|
@@ -12,7 +12,7 @@ endmacro()
|
||
|
|
|
||
|
|
|
||
|
|
# check iSula libutils
|
||
|
|
-pkg_check_modules(PC_ISULA_LIBUTILS REQUIRED "lcr")
|
||
|
|
+pkg_check_modules(PC_ISULA_LIBUTILS REQUIRED "libisula")
|
||
|
|
find_path(ISULA_LIBUTILS_INCLUDE_DIR isula_libutils/log.h
|
||
|
|
HINTS ${PC_ISULA_LIBUTILS_INCLUDEDIR} ${PC_ISULA_LIBUTILS_INCLUDE_DIRS})
|
||
|
|
_CHECK(ISULA_LIBUTILS_INCLUDE_DIR "ISULA_LIBUTILS_INCLUDE_DIR-NOTFOUND" "isula_libutils/log.h")
|
||
|
|
--
|
||
|
|
2.25.1
|
||
|
|
|