| |
@@ -7,7 +7,9 @@
|
| |
%global _docdir_fmt %{name}
|
| |
|
| |
# Master definition that will be written to macro files
|
| |
- %global golang_arches %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
|
| |
+ %global golang_arches_pie %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
|
| |
+ %global golang_arches_nopie %{nil}
|
| |
+ %global golang_arches %{golang_arches_pie} %{golang_arches_nopie}
|
| |
%global gccgo_arches %{mips}
|
| |
# Go sources can contain arch-specific files and our macros will package the
|
| |
# correct files for each architecture. Therefore, move gopath to _libdir and
|
| |
@@ -17,7 +19,7 @@
|
| |
ExclusiveArch: %{golang_arches} %{gccgo_arches}
|
| |
|
| |
Name: go-rpm-macros
|
| |
- Release: 1%{?dist}
|
| |
+ Release: 2%{?dist}
|
| |
Summary: Build-stage rpm automation for Go packages
|
| |
|
| |
License: GPLv3+
|
| |
@@ -125,6 +127,12 @@
|
| |
%ifarch %{golang_arches}
|
| |
install -m 0644 -vp rpm/macros.d/macros.go-compilers-golang \
|
| |
%{buildroot}%{_rpmconfigdir}/macros.d/macros.go-compiler-golang
|
| |
+
|
| |
+ %ifnarch %{golang_arches_pie}
|
| |
+ rm -f %{buildroot}/%{rpmmacrodir}/macros.go-compilers-golang-pie
|
| |
+ %else
|
| |
+ rm -f %{buildroot}/%{rpmmacrodir}/macros.go-compilers-golang-nopie
|
| |
+ %endif
|
| |
%endif
|
| |
|
| |
%ifarch %{gccgo_arches}
|
| |
@@ -162,6 +170,10 @@
|
| |
%{_spectemplatedir}/*.spec
|
| |
|
| |
%changelog
|
| |
+ * Wed Oct 21 2020 Debarshi Ray <rishi@fedoraproject.org> - 3.0.9-2
|
| |
+ - De-duplicate the definition of %%{gocompilerflags} across architectures with
|
| |
+ and without PIE
|
| |
+
|
| |
* Thu Aug 13 2020 Neal Gompa <ngompa13@gmail.com> - 3.0.9-1
|
| |
- Update to 3.0.9
|
| |
|
| |
... across architectures with and without PIE. See:
https://pagure.io/go-rpm-macros/pull-request/21
Based on code written by Daniel P. Berrangé.