From 48da9242e353d988e02bc3100f49913822fa1172 Mon Sep 17 00:00:00 2001 From: zhangxiang Date: Sun, 30 Jul 2023 21:06:33 +0800 Subject: [PATCH] fix gcc build error Add -Wno-nonnull for gcc build error --- clibcni.spec | 10 ++++++++-- fix-gcc.patch | 12 ++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 fix-gcc.patch diff --git a/clibcni.spec b/clibcni.spec index 9192776..99a9d66 100644 --- a/clibcni.spec +++ b/clibcni.spec @@ -1,5 +1,5 @@ %global _version 2.0.7 -%global _release 8 +%global _release 9 Name: clibcni Version: %{_version} Release: %{_release} @@ -11,7 +11,7 @@ Source0: https://gitee.com/openeuler/clibcni/repository/archive/v%{version}.ta BuildRoot: %{_tmppath}/%{name}-%{version} Patch0001: 0001-modify-liblcr-to-libisula.patch - +Patch0002: fix-gcc.patch %define libisulaver_lower 2.1.1-0 BuildRequires: gcc git gcc-c++ @@ -89,6 +89,12 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/%{name}.pc %changelog +* Mon Jul 31 2023 zhangxiang - 2.0.7-9 +- Type: bugfix +- ID: NA +- SUG: NA +- DESC: Add -Wno-nonnull for gcc build error + * Fri May 12 2023 Wenlong Zhang - 2.0.7-8 - Type: feature - ID: NA diff --git a/fix-gcc.patch b/fix-gcc.patch new file mode 100644 index 0000000..124d11e --- /dev/null +++ b/fix-gcc.patch @@ -0,0 +1,12 @@ +diff -ur clibcni-v2.0.7/CMakeLists.txt clibcni-v2.0.7-rv/CMakeLists.txt +--- clibcni-v2.0.7/CMakeLists.txt 2023-07-30 21:04:52.729518735 +0800 ++++ clibcni-v2.0.7-rv/CMakeLists.txt 2023-07-30 21:05:34.909592598 +0800 +@@ -22,7 +22,7 @@ + return() + endif() + +-set(CMAKE_C_FLAGS "-fPIC -fstack-protector-all -D_FORTIFY_SOURCE=2 -O2 -Wall -Werror") ++set(CMAKE_C_FLAGS "-fPIC -fstack-protector-all -D_FORTIFY_SOURCE=2 -O2 -Wall -Werror -Wno-nonnull") + set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-E -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -Wtrampolines -fPIE -pie -shared -pthread") + if ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") + set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-E -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -Wtrampolines -fPIE -shared -pthread") -- Gitee