From 02c7d6021b47081ce7b6bb8023434600d6c2c7a0 Mon Sep 17 00:00:00 2001 From: veega2022 Date: Sat, 3 Jun 2023 10:19:20 +0800 Subject: [PATCH] hikptool: fix compiling specifications check problem Signed-off-by: veega2022 (cherry picked from commit dc99219c2a814faeaa348eef060ab292a6f8440f) --- ...mpiling-specifications-check-problem.patch | 30 +++++++++++++++++++ hikptool.spec | 8 ++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0016-hikptool-fix-compiling-specifications-check-problem.patch diff --git a/0016-hikptool-fix-compiling-specifications-check-problem.patch b/0016-hikptool-fix-compiling-specifications-check-problem.patch new file mode 100644 index 0000000..7d00876 --- /dev/null +++ b/0016-hikptool-fix-compiling-specifications-check-problem.patch @@ -0,0 +1,30 @@ +From 834b2fe48984703a41aceb2307b8604b93d0e6e8 Mon Sep 17 00:00:00 2001 +From: veega +Date: Thu, 1 Jun 2023 09:56:39 +0800 +Subject: [PATCH] hikptool: fix compiling specifications check problem + +delete -g option for release vesion and add compile option: -Wextra +-fno-common -std=gnu11 -Wfloat-equal + +Signed-off-by: veega +--- + CMakeLists.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6a396e7..174dd8f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,7 +11,8 @@ + + project(hikptool C) + +-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O2 -fPIC -fPIE -Wall") ++set(CMAKE_C_FLAGS ++ "${CMAKE_C_FLAGS} -O2 -fPIC -fPIE -Wall -Wextra -fno-common -std=gnu11 -Wfloat-equal") + set(CMAKE_SKIP_RPATH TRUE) + + macro(get_header_dir_recurse HEADER_DIR_LIST) +-- +2.25.1 + diff --git a/hikptool.spec b/hikptool.spec index 7bff829..8aa4507 100644 --- a/hikptool.spec +++ b/hikptool.spec @@ -1,7 +1,9 @@ +%define _debugsource_template %{nil} + Name: hikptool Summary: A userspace tool for Linux providing problem location on Kunpeng chips Version: 1.0.0 -Release: 10 +Release: 11 License: MulanPSL2 Source: %{name}-%{version}.tar.gz ExclusiveOS: linux @@ -29,6 +31,7 @@ Patch0012: 0012-Fix-a-resource-release-bug-in-hikp_roh_get_cam_reg_n.patch Patch0013: 0013-fix-missing-white-space-issue.patch Patch0014: 0014-hikptool-fix-maininfo-detail-info-print-error.patch Patch0015: 0015-hikptool-fix-print-sas_dqe-info-error-problem.patch +Patch0016: 0016-hikptool-fix-compiling-specifications-check-problem.patch %description This package contains the hikptool @@ -81,6 +84,9 @@ fi /sbin/ldconfig %changelog +* Sat Jun 03 2023 veega2022 1.0.0-11 +- fix compiling specifications check problem + * Tue May 30 2023 veega2022 1.0.0-10 - sync code: fix PCIe and serdes, roh module problem -- Gitee