From 17789f3a74c7aa0a57f6ba355ac710c1b7334ef1 Mon Sep 17 00:00:00 2001 From: David Benoit Date: Tue, 27 Jul 2021 11:53:44 -0400 Subject: [PATCH] Remove arch conditional on gocompilerflags Related: rhbz#1982298 --- go-rpm-macros.spec | 6 +++++- remove-fedora-dependency-automation.patch | 9 ++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/go-rpm-macros.spec b/go-rpm-macros.spec index f8431a4..a2eab7e 100644 --- a/go-rpm-macros.spec +++ b/go-rpm-macros.spec @@ -20,7 +20,7 @@ Version: 3.0.9 ExclusiveArch: %{golang_arches} %{gccgo_arches} Name: go-rpm-macros -Release: 5%{?dist} +Release: 6%{?dist} Summary: Build-stage rpm automation for Go packages License: GPLv3+ @@ -191,6 +191,10 @@ install -m 0644 -vp rpm/macros.d/macros.go-compilers-gcc \ %dir %{_spectemplatedir} %changelog +* Tue Jul 27 2021 David Benoit 3.0.9-6 +- Remove arch conditional on gocompilerflags +- Related: rhbz#1982298 + * Fri Jul 23 2021 David Benoit 3.0.9-5 - Remove fedora-specific Go dependency automation macros - Remove dependency on golist diff --git a/remove-fedora-dependency-automation.patch b/remove-fedora-dependency-automation.patch index b039b0e..e1cd9b9 100644 --- a/remove-fedora-dependency-automation.patch +++ b/remove-fedora-dependency-automation.patch @@ -195,20 +195,19 @@ index 457b8f1..d650b26 100644 } + diff --git a/rpm/macros.d/macros.go-compilers-golang b/rpm/macros.d/macros.go-compilers-golang -index b0ab4c4..f5b1c9f 100644 +index b0ab4c4..49bf9b6 100644 --- a/rpm/macros.d/macros.go-compilers-golang +++ b/rpm/macros.d/macros.go-compilers-golang -@@ -20,6 +20,9 @@ +@@ -20,6 +20,8 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -+# -buildmode pie does not currently work on ppc64le -+%gocompilerflags %{expand: %[ "%{_arch}" != "ppc64le" ? "-buildmode pie" : "%{nil}"] -compiler gc} ++%gocompilerflags -buildmode pie -compiler gc + # This *must* be all on one line, as it will be used in shell # assignments. eg # -@@ -29,22 +32,32 @@ +@@ -29,22 +31,32 @@ # # %make GOBUILDFLAGS="%gobuildflags" #