From fa83a93b2e1f36bb1e56b0be873d8d494e8a4723 Mon Sep 17 00:00:00 2001 From: luofeng14 Date: Mon, 4 Mar 2024 08:05:37 +0000 Subject: [PATCH] support clang build Signed-off-by: luofeng14 (cherry picked from commit 31eebd3db8e8523387c23a3a455df1a57494890e) --- secpaver.spec | 7 ++++++- support-clang-build.patch | 25 +++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 support-clang-build.patch diff --git a/secpaver.spec b/secpaver.spec index 5f02b7e..a4105e0 100755 --- a/secpaver.spec +++ b/secpaver.spec @@ -2,7 +2,7 @@ Name: secpaver Summary: Security policy development tool Version: 1.0.2 -Release: 6 +Release: 7 License: MulanPSL-2.0 URL: https://gitee.com/openeuler/secpaver Source: https://gitee.com/openeuler/secpaver/repository/archive/%{name}-%{version}.tar.gz @@ -11,6 +11,8 @@ Source1: sys.tar.gz Patch0001: dont-do-daemon-reload-in-make-install.patch Patch0002: set-default-log-path.patch +Patch0003: support-clang-build.patch + %ifarch riscv64 Patch1000: 1000-fix-build-on-riscv64.patch %endif @@ -82,6 +84,9 @@ tar -xf %{SOURCE1} -C vendor/golang.org/x/ %systemd_postun_with_restart pavd.service %changelog +* Fri Mar 1 2024 luofeng - 1.0.2-7 +- support clang build + * Fri Sep 15 2023 misaka00251 - 1.0.2-6 - Fix build on riscv64 diff --git a/support-clang-build.patch b/support-clang-build.patch new file mode 100644 index 0000000..a51e2eb --- /dev/null +++ b/support-clang-build.patch @@ -0,0 +1,25 @@ +From cb587f370f5cd9caf57c8c4364392f5513435b21 Mon Sep 17 00:00:00 2001 +From: luofeng +Date: Mon, 4 Mar 2024 15:49:13 +0800 +Subject: [PATCH] support clang build + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 858346a..405bcc3 100644 +--- a/Makefile ++++ b/Makefile +@@ -23,7 +23,7 @@ SYSTEMD_DIR = $(DESTDIR)/usr/lib/systemd/system + LOG_DIR := $(DESTDIR)/var/log/secpaver + + BUILDFLAGS := -trimpath +-LDFLAGS := -w -s -buildid=IdBySecPaver -linkmode=external -extldflags=-static -extldflags=-zrelro -extldflags=-znow $(LDFLAGS) ++LDFLAGS := -w -s -buildid=IdBySecPaver -linkmode=external -extldflags=-static -extldflags=-zrelro -extldflags=-Wl,-z,now $(LDFLAGS) + + ifeq ($(shell go help mod >/dev/null 2>&1 && echo true), true) + export GO111MODULE=on +-- +2.19.1 + -- Gitee