From 03a7514739d508201393e3249ae0bdaffc8516e4 Mon Sep 17 00:00:00 2001 From: s Date: Fri, 22 Sep 2023 08:08:52 +0800 Subject: [PATCH] fix clang build error --- fix-clang.patch | 16 ++++++++++++++++ secpaver.spec | 6 +++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 fix-clang.patch diff --git a/fix-clang.patch b/fix-clang.patch new file mode 100644 index 0000000..719fce1 --- /dev/null +++ b/fix-clang.patch @@ -0,0 +1,16 @@ +diff -u -r secpaver-1.0.2/Makefile secpaver-1.0.2/Makefile +--- secpaver-1.0.2/Makefile 2021-09-30 18:03:53.000000000 +0800 ++++ secpaver-1.0.2/Makefile 2023-05-06 14:04:14.000000000 +0800 +@@ -23,7 +23,11 @@ + LOG_DIR := $(DESTDIR)/var/log/secpaver + + BUILDFLAGS := -trimpath +-LDFLAGS := -w -s -buildid=IdBySecPaver -linkmode=external -extldflags=-static -extldflags=-zrelro -extldflags=-znow $(LDFLAGS) ++ifeq ($(CC),gcc) ++ LDFLAGS := -w -s -buildid=IdBySecPaver -linkmode=external -extldflags=-static -extldflags=-zrelro -extldflags=-znow $(LDFLAGS) ++else ifeq ($(CC),clang) ++ LDFLAGS := -w -s -buildid=IdBySecPaver -linkmode=external -extldflags=-static -extldflags=-Wl,-z,relro,-z,now ++endif + + ifeq ($(shell go help mod >/dev/null 2>&1 && echo true), true) + export GO111MODULE=on diff --git a/secpaver.spec b/secpaver.spec index 36d5728..5e26c26 100755 --- a/secpaver.spec +++ b/secpaver.spec @@ -2,7 +2,7 @@ Name: secpaver Summary: Security policy development tool Version: 1.0.2 -Release: 5 +Release: 6 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,7 @@ Source1: sys.tar.gz Patch0001: dont-do-daemon-reload-in-make-install.patch Patch0002: set-default-log-path.patch +Patch0003: fix-clang.patch BuildRequires: golang make systemd Requires: %{name}-plugin = %{version}-%{release} @@ -79,6 +80,9 @@ tar -xf %{SOURCE1} -C vendor/golang.org/x/ %systemd_postun_with_restart pavd.service %changelog +* Fri Sep 22 2023 yoo - 1.0.2-6 +- fix clang build error + * Tue Jul 11 2023 huajingyun - 1.0.2-5 - Add loong64 support -- Gitee