diff --git a/0001-improve-code-for-check-ags.patch b/0001-improve-code-for-check-ags.patch index 45a8db739616f189ca388ad42db4bde5e3075f57..2237e2d8821c7828bd674a42fd2e347b84802afd 100644 --- a/0001-improve-code-for-check-ags.patch +++ b/0001-improve-code-for-check-ags.patch @@ -1,7 +1,7 @@ From 9911948a5806c6641d8c6a7ffe7cbe82da165917 Mon Sep 17 00:00:00 2001 From: haozi007 Date: Mon, 22 Nov 2021 06:27:10 +0000 -Subject: [PATCH 1/3] improve code for check ags +Subject: [PATCH 1/6] improve code for check ags Signed-off-by: haozi007 --- diff --git a/0002-improve-coverage-of-ut.patch b/0002-improve-coverage-of-ut.patch index a6e3638a2bf99faf82ff92fd5f8fc8c19ceb7bc6..b5bf5fc7f6f9720e36a7454fdfa24bcb263c2bd3 100644 --- a/0002-improve-coverage-of-ut.patch +++ b/0002-improve-coverage-of-ut.patch @@ -1,7 +1,7 @@ From 76386373577c70a3a302c6aaa48fd301ffb173b2 Mon Sep 17 00:00:00 2001 From: haozi007 Date: Mon, 22 Nov 2021 06:27:29 +0000 -Subject: [PATCH 2/3] improve coverage of ut +Subject: [PATCH 2/6] improve coverage of ut Signed-off-by: haozi007 --- diff --git a/0003-support-new-cpp-synx-check.patch b/0003-support-new-cpp-synx-check.patch index 24c5cef87c5949a0f17624fa5e4cf5d85fdbe757..561100804499ee175ff06e26d7d9e334d8336b38 100644 --- a/0003-support-new-cpp-synx-check.patch +++ b/0003-support-new-cpp-synx-check.patch @@ -1,7 +1,7 @@ From 830b3ce91c04c6d6970e7564834720f3a1d57b80 Mon Sep 17 00:00:00 2001 From: haozi007 Date: Mon, 22 Nov 2021 11:32:00 +0000 -Subject: [PATCH 3/3] support new cpp synx check +Subject: [PATCH 3/6] support new cpp synx check Signed-off-by: haozi007 --- diff --git a/0004-permit-other-read-pc-and-so-of-clibcni.patch b/0004-permit-other-read-pc-and-so-of-clibcni.patch new file mode 100644 index 0000000000000000000000000000000000000000..2513020ae419a13e94788292f5d1748bf1bb1e26 --- /dev/null +++ b/0004-permit-other-read-pc-and-so-of-clibcni.patch @@ -0,0 +1,37 @@ +From 2667fdf06d366ec6222302244f1aad078727d6e5 Mon Sep 17 00:00:00 2001 +From: haozi007 +Date: Thu, 2 Dec 2021 11:53:26 +0000 +Subject: [PATCH 4/6] permit other read pc and so of clibcni + +Signed-off-by: haozi007 +--- + CMakeLists.txt | 2 +- + src/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f812dde..64193b4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -76,7 +76,7 @@ endif() + + # install all files + install(FILES ${CMAKE_BINARY_DIR}/conf/clibcni.pc +- DESTINATION ${LIB_INSTALL_DIR_DEFAULT}/pkgconfig PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE) ++ DESTINATION ${LIB_INSTALL_DIR_DEFAULT}/pkgconfig PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE WORLD_READ WORLD_EXECUTE) + install(FILES src/types/types.h DESTINATION include/clibcni) + install(FILES src/version/version.h DESTINATION include/clibcni) + install(FILES src/api.h DESTINATION include/clibcni) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 1fe1b72..6f05299 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -27,4 +27,4 @@ target_link_libraries(clibcni ${ISULA_LIBUTILS_LIBRARY}) + + # install all files + install(TARGETS clibcni +- LIBRARY DESTINATION ${LIB_INSTALL_DIR_DEFAULT} PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE) ++ LIBRARY DESTINATION ${LIB_INSTALL_DIR_DEFAULT} PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) +-- +2.20.1 + diff --git a/0005-fix-the-error-of-gcc-compilation-optimization-level.patch b/0005-fix-the-error-of-gcc-compilation-optimization-level.patch new file mode 100644 index 0000000000000000000000000000000000000000..4be7a8e40c62e740c27bc5600d82fc6366b4832c --- /dev/null +++ b/0005-fix-the-error-of-gcc-compilation-optimization-level.patch @@ -0,0 +1,26 @@ +From e41403afe07661518b0e4a6a509f3ec916c3a83f Mon Sep 17 00:00:00 2001 +From: wujing +Date: Thu, 9 Dec 2021 11:01:31 +0800 +Subject: [PATCH 5/6] 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 64193b4..09bf3f9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,7 +8,7 @@ endif() + + option(DEBUG "set clibcni gcc option" ON) + if (DEBUG STREQUAL "ON") +- add_definitions("-g -o2") ++ add_definitions("-g -O2") + endif() + + option(GCOV "set clibcni gcov option" OFF) +-- +2.20.1 + diff --git a/clibcni.spec b/clibcni.spec index 152c3c27d5ff6beea26e5731ed21e743b9efb36e..792a76c5dee66c5eec77c8eabc04546bbed21930 100644 --- a/clibcni.spec +++ b/clibcni.spec @@ -1,5 +1,5 @@ %global _version 2.0.6 -%global _release 6 +%global _release 7 Name: clibcni Version: %{_version} Release: %{_release} @@ -13,6 +13,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version} Patch0001: 0001-improve-code-for-check-ags.patch Patch0002: 0002-improve-coverage-of-ut.patch Patch0003: 0003-support-new-cpp-synx-check.patch +Patch0004: 0004-permit-other-read-pc-and-so-of-clibcni.patch +Patch0005: 0005-fix-the-error-of-gcc-compilation-optimization-level.patch %define lcrver 2.0.6 @@ -95,6 +97,12 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/%{name}.pc %changelog +* Mon Jan 10 2022 haozi007 - 2.0.6-7 +- Type: sync patch from upstream +- ID: NA +- SUG: NA +- DESC: sync from openeuler + * Mon Jan 10 2022 haozi007 - 2.0.6-6 - Type: adapt to new gmock - ID: NA