You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
49 lines
2.2 KiB
49 lines
2.2 KiB
7 months ago
|
From 83e6fb7438808e50f8ac8707d8492d1a32432915 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Maxwell G <maxwell@gtmx.me>
|
||
|
|
Date: Wed, 13 Mar 2024 22:56:27 +0000
|
||
|
|
Subject: [PATCH] Makefile: adjust GO_LDFLAGS flags
|
||
|
|
|
||
|
|
Double quotes are needed for compatibility with Fedora's
|
||
|
|
`%{gobuild_ldflags_shescaped}`. We use single quotes within our flags
|
||
|
|
definition.
|
||
|
|
|
||
|
|
We also disable static linking for SHIM_GO_LDFLAGS and re-enable
|
||
|
|
SHIM_CGO_ENABLED and PIE in the specfile
|
||
|
|
---
|
||
|
|
Makefile | 8 ++++----
|
||
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Makefile b/Makefile
|
||
|
|
index 905dfed..291b494 100644
|
||
|
|
--- a/Makefile
|
||
|
|
+++ b/Makefile
|
||
|
|
@@ -96,13 +96,13 @@ ifneq ($(STATIC),)
|
||
|
|
endif
|
||
|
|
GO_TAGS=$(if $(GO_BUILDTAGS),-tags "$(strip $(GO_BUILDTAGS))",)
|
||
|
|
|
||
|
|
-GO_LDFLAGS=-ldflags '-X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PACKAGE) $(EXTRA_LDFLAGS)
|
||
|
|
+GO_LDFLAGS=-ldflags "-X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PACKAGE) $(EXTRA_LDFLAGS)
|
||
|
|
ifneq ($(STATIC),)
|
||
|
|
GO_LDFLAGS += -extldflags "-static"
|
||
|
|
endif
|
||
|
|
-GO_LDFLAGS+='
|
||
|
|
+GO_LDFLAGS+="
|
||
|
|
|
||
|
|
-SHIM_GO_LDFLAGS=-ldflags '-X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PACKAGE) -extldflags "-static" $(EXTRA_LDFLAGS)'
|
||
|
|
+SHIM_GO_LDFLAGS=-ldflags "-X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PACKAGE) $(EXTRA_LDFLAGS)"
|
||
|
|
|
||
|
|
# Project packages.
|
||
|
|
PACKAGES=$(shell $(GO) list ${GO_TAGS} ./... | grep -v /vendor/ | grep -v /integration)
|
||
|
|
@@ -257,7 +257,7 @@ bin/%: cmd/% FORCE
|
||
|
|
# gen-manpages must not have the urfave_cli_no_docs build-tag set
|
||
|
|
bin/gen-manpages: cmd/gen-manpages FORCE
|
||
|
|
@echo "$(WHALE) $@"
|
||
|
|
- $(GO) build ${DEBUG_GO_GCFLAGS} ${GO_GCFLAGS} ${GO_BUILD_FLAGS} -o $@ ${GO_LDFLAGS} $(subst urfave_cli_no_docs,,${GO_TAGS}) ./cmd/gen-manpages
|
||
|
|
+ $(GO) build ${DEBUG_GO_GCFLAGS} ${GO_GCFLAGS} ${GO_BUILD_FLAGS} -o $@ $(subst urfave_cli_no_docs,,${GO_TAGS}) ./cmd/gen-manpages
|
||
|
|
|
||
|
|
bin/containerd-shim: cmd/containerd-shim FORCE # set !cgo and omit pie for a static shim build: https://github.com/golang/go/issues/17789#issuecomment-258542220
|
||
|
|
@echo "$(WHALE) $@"
|
||
|
|
--
|
||
|
|
2.44.0
|
||
|
|
|