modify lcr dependence to libisula
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
This commit is contained in:
parent
ddc38f5192
commit
0b3d319e4b
57
0001-modify-liblcr-to-libisula.patch
Normal file
57
0001-modify-liblcr-to-libisula.patch
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
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
|
||||||
|
|
||||||
17
clibcni.spec
17
clibcni.spec
@ -1,5 +1,5 @@
|
|||||||
%global _version 2.0.7
|
%global _version 2.0.7
|
||||||
%global _release 5
|
%global _release 6
|
||||||
Name: clibcni
|
Name: clibcni
|
||||||
Version: %{_version}
|
Version: %{_version}
|
||||||
Release: %{_release}
|
Release: %{_release}
|
||||||
@ -10,14 +10,15 @@ URL: https://gitee.com/openeuler/clibcni
|
|||||||
Source0: https://gitee.com/openeuler/clibcni/repository/archive/v%{version}.tar.gz
|
Source0: https://gitee.com/openeuler/clibcni/repository/archive/v%{version}.tar.gz
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}
|
BuildRoot: %{_tmppath}/%{name}-%{version}
|
||||||
|
|
||||||
%define lcrver_lower 2.0.9-0
|
Patch0001: 0001-modify-liblcr-to-libisula.patch
|
||||||
%define lcrver_upper 2.0.10-0
|
|
||||||
|
%define libisulaver_lower 2.1.1-0
|
||||||
|
|
||||||
BuildRequires: gcc git gcc-c++
|
BuildRequires: gcc git gcc-c++
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: lcr-devel > %{lcrver_lower} lcr-devel < %{lcrver_upper} yajl-devel gtest-devel gmock-devel
|
BuildRequires: libisula-devel > %{libisulaver_lower} yajl-devel gtest-devel gmock-devel
|
||||||
|
|
||||||
Requires: lcr > %{lcrver_lower} lcr < %{lcrver_upper}
|
Requires: libisula > %{libisulaver_lower}
|
||||||
|
|
||||||
%ifarch x86_64 aarch64
|
%ifarch x86_64 aarch64
|
||||||
Provides: lib%{name}.so()(64bit)
|
Provides: lib%{name}.so()(64bit)
|
||||||
@ -88,6 +89,12 @@ rm -rf %{buildroot}
|
|||||||
%{_libdir}/pkgconfig/%{name}.pc
|
%{_libdir}/pkgconfig/%{name}.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Feb 06 2023 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 2.0.7-6
|
||||||
|
- Type: bugfix
|
||||||
|
- ID: NA
|
||||||
|
- SUG: NA
|
||||||
|
- DESC: modify lcr dependence to libisula
|
||||||
|
|
||||||
* Wed Dec 21 2022 wangrunze <wangrunze13@huawei.com> - 2.0.7-5
|
* Wed Dec 21 2022 wangrunze <wangrunze13@huawei.com> - 2.0.7-5
|
||||||
- Type: bugfix
|
- Type: bugfix
|
||||||
- ID: NA
|
- ID: NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user