fd1993
From a245af969792bafcfa86090c856a06cb23061816 Mon Sep 17 00:00:00 2001
4fbc4a
From: Debarshi Ray <rishi@fedoraproject.org>
4fbc4a
Date: Mon, 29 Jun 2020 17:57:47 +0200
4fbc4a
Subject: [PATCH] build: Make the build flags match RHEL's %{gobuild} for PPC64
4fbc4a
4fbc4a
The Go toolchain doesn't play well with passing compiler and linker
4fbc4a
flags via environment variables. The linker flags require a second
4fbc4a
level of quoting, which leaves the build system without a quote level
4fbc4a
to assign the flags to an environment variable like GOFLAGS.
4fbc4a
4fbc4a
This is one reason why RHEL doesn't have a RPM macro with only the
4fbc4a
flags. The %{gobuild} RPM macro includes the entire 'go build ...'
4fbc4a
invocation.
4fbc4a
4fbc4a
The Go toolchain also doesn't like the LDFLAGS environment variable as
4fbc4a
exported by RHEL's %{meson} RPM macro, and RHEL's RPM toolchain doesn't
4fbc4a
like the compressed DWARF data generated by the Go toolchain.
4fbc4a
4fbc4a
Note that these flags are only meant for the "ppc64" CPU architecture,
4fbc4a
and should be kept updated to match RHEL's Go guidelines. Use
4fbc4a
'rpm --eval "%{gobuild}"' to expand the %{gobuild} macro.
4fbc4a
---
4fbc4a
 src/go-build-wrapper | 3 ++-
4fbc4a
 1 file changed, 2 insertions(+), 1 deletion(-)
4fbc4a
4fbc4a
diff --git a/src/go-build-wrapper b/src/go-build-wrapper
fd1993
index 0d27120da052..ef1a03af750a 100755
4fbc4a
--- a/src/go-build-wrapper
4fbc4a
+++ b/src/go-build-wrapper
4fbc4a
@@ -27,5 +27,6 @@ if ! cd "$1"; then
4fbc4a
     exit 1
4fbc4a
 fi
4fbc4a
 
4fbc4a
-go build -trimpath -ldflags "-extldflags '-Wl,--wrap,pthread_sigmask $4' -linkmode external -X github.com/containers/toolbox/pkg/version.currentVersion=$3" -o "$2/toolbox"
4fbc4a
+unset LDFLAGS
4fbc4a
+go build -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -extldflags '-Wl,-z,relro -Wl,--as-needed  -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -Wl,--wrap,pthread_sigmask $4' -linkmode external -X github.com/containers/toolbox/pkg/version.currentVersion=$3" -a -v -x -o "$2/toolbox"
4fbc4a
 exit "$?"
4fbc4a
-- 
fd1993
2.31.1
4fbc4a