fix go build ref cldflags

Signed-off-by: luofeng14 <luofeng13@huawei.com>
(cherry picked from commit efb08e2c007416dfa9f3ef7111a2730eae980c81)
This commit is contained in:
luofeng14 2024-04-02 12:20:23 +00:00 committed by openeuler-sync-bot
parent 68068302e1
commit 74c0300572
2 changed files with 30 additions and 1 deletions

View File

@ -0,0 +1,25 @@
From a52f67f2dbdf1b20b17061c695049e9ffec795c9 Mon Sep 17 00:00:00 2001
From: luofeng <luofeng13@huawei.com>
Date: Tue, 2 Apr 2024 20:00:04 +0800
Subject: [PATCH] fix go build ref cldflags
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 405bcc3..8a29fb1 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=-Wl,-z,now $(LDFLAGS)
+LDFLAGS := -w -s -buildid=IdBySecPaver -linkmode=external -extldflags=-static -extldflags=-zrelro -extldflags=-Wl,-z,now
ifeq ($(shell go help mod >/dev/null 2>&1 && echo true), true)
export GO111MODULE=on
--
2.19.1

View File

@ -2,7 +2,7 @@
Name: secpaver
Summary: Security policy development tool
Version: 1.0.2
Release: 7
Release: 8
License: MulanPSL-2.0
URL: https://gitee.com/openeuler/secpaver
Source: https://gitee.com/openeuler/secpaver/repository/archive/%{name}-%{version}.tar.gz
@ -12,6 +12,7 @@ Source1: sys.tar.gz
Patch0001: dont-do-daemon-reload-in-make-install.patch
Patch0002: set-default-log-path.patch
Patch0003: support-clang-build.patch
Patch0004: fix-go-build-ref-cldflags.patch
%ifarch riscv64
Patch1000: 1000-fix-build-on-riscv64.patch
@ -84,6 +85,9 @@ tar -xf %{SOURCE1} -C vendor/golang.org/x/
%systemd_postun_with_restart pavd.service
%changelog
* Mon Apr 1 2024 luofeng <luofeng13@huawei.com> - 1.0.2-8
- fix go build ref C LDFLAGS
* Fri Mar 1 2024 luofeng <luofeng13@huawei.com> - 1.0.2-7
- support clang build