From 2c89e667931fa39735eea8c96ee152aebe87bb12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E4=B9=89?= <977713017@qq.com> Date: Thu, 10 Aug 2023 07:42:28 +0000 Subject: [PATCH] Fix error issue, unused compilation options MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 任义 <977713017@qq.com> --- 0005-fix-error-unuse-option.patch | 14 ++++++++++++++ oncn-bwm.spec | 8 ++++++++ 2 files changed, 22 insertions(+) create mode 100644 0005-fix-error-unuse-option.patch diff --git a/0005-fix-error-unuse-option.patch b/0005-fix-error-unuse-option.patch new file mode 100644 index 0000000..dc8607b --- /dev/null +++ b/0005-fix-error-unuse-option.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 70b47e7..d6560c1 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,7 +1,7 @@ + cmake_minimum_required(VERSION 3.12.1) + project(bwmcli LANGUAGES C ) +-set(CMAKE_C_FLAGS "-g -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -Werror -ftrapv -O2 -Wl,-z,noexecstack \ +- -Wl,-z,relro -fPIE -pie -Wl,-z,now") ++set(CMAKE_C_FLAGS "-g -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -Werror -ftrapv -O2") ++set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-z,noexecstack -Wl,-z,relro -fPIE -pie -Wl,-z,now") + + include_directories("${PROJECT_SOURCE_DIR}/") + include_directories("${PROJECT_SOURCE_DIR}/bpf") \ No newline at end of file diff --git a/oncn-bwm.spec b/oncn-bwm.spec index 5db692b..74d1a83 100644 --- a/oncn-bwm.spec +++ b/oncn-bwm.spec @@ -19,6 +19,11 @@ Patch9002: 0002-clean-code-and-use-securec-function.patch Patch9003: 0003-add-proc-file-interface.patch Patch9004: 0004-fix-offline-packets-block.patch +%if "%toolchain" == "clang" +%define debug_package %{nil} +%define __strip /bin/true +%endif + %description Pod bandwidth management in mixed deployment scenarios of online and offline services @@ -112,6 +117,9 @@ depmod -a %changelog +* Thu Aug 10 2023 renyi <977713017@qq.com> - 1.1-5 +- fix error unuse option + * Sat May 20 2023 JofDiamonds - 1.1-4 - fix offline packets block -- Gitee