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.
50 lines
2.8 KiB
50 lines
2.8 KiB
diff --git a/rpm/macros.d/macros.go-compilers-golang b/rpm/macros.d/macros.go-compilers-golang |
|
index b0ab4c4..942549f 100644 |
|
--- a/rpm/macros.d/macros.go-compilers-golang |
|
+++ b/rpm/macros.d/macros.go-compilers-golang |
|
@@ -20,6 +20,8 @@ |
|
# |
|
# SPDX-License-Identifier: GPL-3.0-or-later |
|
|
|
+%gocompilerflags -buildmode pie -compiler gc |
|
+ |
|
# This *must* be all on one line, as it will be used in shell |
|
# assignments. eg |
|
# |
|
@@ -29,22 +31,33 @@ |
|
# |
|
# %make GOBUILDFLAGS="%gobuildflags" |
|
# |
|
-%gobuildflags() %{expand:%{gocompilerflags} -tags=\\"rpm_crashtraceback \\" -ldflags \\"${LDFLAGS:-}%{?currentgoldflags} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags %{?__golang_extldflags}'\\" -a -v -x} |
|
+%gobuildflags() %{expand:%{gocompilerflags} -tags=\\"rpm_crashtraceback ${BUILDTAGS:-} libtrust_openssl\\" -ldflags \\"-linkmode=external -compressdwarf=false ${LDFLAGS:-}%{?currentgoldflags} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags %{?__golang_extldflags}'\\" -a -v -x} |
|
+%_gobuildflags_internal() %{expand:%{gocompilerflags} -tags="rpm_crashtraceback ${BUILDTAGS:-} libtrust_openssl" -ldflags "-linkmode=external -compressdwarf=false ${LDFLAGS:-}%{?currentgoldflags} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags %{?__golang_extldflags}'" -a -v -x} |
|
|
|
# Turn off Go modules |
|
%gomodulesmode GO111MODULE=off |
|
|
|
# Define commands for building |
|
# BUILD_ID can be generated for golang build no matter of debuginfo |
|
+ |
|
+%_gobuild_cmd CGO_CPPFLAGS="-D_FORTIFY_SOURCE=2 -fstack-protector-all" go build %{_gobuildflags_internal} |
|
+%gobuild_compat_el8(o:) %{expand:%{_gobuild_cmd} %{?**};} |
|
%gobuild(o:) %{expand: |
|
# https://bugzilla.redhat.com/show_bug.cgi?id=995136#c12 |
|
%global _dwz_low_mem_die_limit 0 |
|
%{?gobuilddir:GOPATH="%{gobuilddir}:${GOPATH:+${GOPATH}:}%{?gopath}"} %{?gomodulesmode} \\ |
|
- go build %{?gocompilerflags} -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-}%{?currentgoldflags} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags %{?__golang_extldflags}'" -a -v -x %{?**}; |
|
+ %{_gobuild_cmd} %{?**}; |
|
} |
|
${workroot}${GOPATH:+:${GOPATH}} |
|
|
|
# Define commands for testing |
|
%gotestflags %{gocompilerflags} |
|
%gotestextldflags %__global_ldflags %{?__golang_extldflags} |
|
-%gotest() %{?gomodulesmode} go test %{gotestflags} -ldflags "${LDFLAGS:-}%{?currentgoldflags} -extldflags '%{gotestextldflags}'" %{?**}; |
|
+ |
|
+%_gotest_cmd %{?gomodulesmode} go test %{gotestflags} -ldflags "${LDFLAGS:-}%{?currentgoldflags} -extldflags '%{gotestextldflags}'" |
|
+%gotest_compat_el8(o:) %{expand:%{_gotest_cmd} %{?**};} |
|
+%gotest(o:) %{expand: |
|
+ %{?gobuilddir:GOPATH="%{gobuilddir}:${GOPATH:+${GOPATH}:}%{?gopath}"} %{?gomodulesmode} \\ |
|
+ %{_gotest_cmd} %{?**}; |
|
+} |
|
+
|
|
|