rpms/go-rpm-macros
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove arch conditional on gocompilerflags

Browse Source 
Related: rhbz#1982298
This commit is contained in:
David Benoit 2021-07-27 11:53:44 -04:00
parent 27765cfae5
commit 17789f3a74
No known key found for this signature in database
GPG Key ID: 58EDBABB7196BDD3
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
go-rpm-macros.spec
View File

@ -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 <dbenoit@redhat.com> 3.0.9-6
- Remove arch conditional on gocompilerflags
- Related: rhbz#1982298
* Fri Jul 23 2021 David Benoit <dbenoit@redhat.com> 3.0.9-5
- Remove fedora-specific Go dependency automation macros
- Remove dependency on golist

9
remove-fedora-dependency-automation.patch
View File

@ -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"
#