Update to 2.1.0
Signed-off-by: jikai <jikai11@huawei.com>
This commit is contained in:
parent
705da3ddc2
commit
c04bfd1c41
@ -1,57 +0,0 @@
|
||||
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
|
||||
|
||||
12
clibcni.spec
12
clibcni.spec
@ -1,5 +1,5 @@
|
||||
%global _version 2.0.7
|
||||
%global _release 8
|
||||
%global _version 2.1.0
|
||||
%global _release 1
|
||||
Name: clibcni
|
||||
Version: %{_version}
|
||||
Release: %{_release}
|
||||
@ -10,8 +10,6 @@ URL: https://gitee.com/openeuler/clibcni
|
||||
Source0: https://gitee.com/openeuler/clibcni/repository/archive/v%{version}.tar.gz
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}
|
||||
|
||||
Patch0001: 0001-modify-liblcr-to-libisula.patch
|
||||
|
||||
%define libisulaver_lower 2.1.1-0
|
||||
|
||||
BuildRequires: gcc git gcc-c++
|
||||
@ -89,6 +87,12 @@ rm -rf %{buildroot}
|
||||
%{_libdir}/pkgconfig/%{name}.pc
|
||||
|
||||
%changelog
|
||||
* Thu Nov 16 2023 jikai <jikai11@huawei.com> - 2.1.0-1
|
||||
- Type: enhancement
|
||||
- ID: NA
|
||||
- SUG: NA
|
||||
- DESC: Update to 2.1.0
|
||||
|
||||
* Fri May 12 2023 Wenlong Zhang <zhangwenlong@loongson.cn> - 2.0.7-8
|
||||
- Type: feature
|
||||
- ID: NA
|
||||
|
||||
BIN
v2.0.7.tar.gz
BIN
v2.0.7.tar.gz
Binary file not shown.
BIN
v2.1.0.tar.gz
Normal file
BIN
v2.1.0.tar.gz
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user