[redhat-rpm-config] - Also set FCFLAGS from %%configure (#914831)
Panu Matilainen
pmatilai at fedoraproject.org
Tue Apr 23 04:34:11 UTC 2013
commit 234364ec2f4ab5182b36eaff9d50ad06073d01a2
Author: Panu Matilainen <pmatilai at redhat.com>
Date: Tue Apr 23 07:33:30 2013 +0300
- Also set FCFLAGS from %%configure (#914831)
redhat-rpm-config-9.1.0-fcflags.patch | 11 +++++++++++
redhat-rpm-config.spec | 4 ++++
2 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/redhat-rpm-config-9.1.0-fcflags.patch b/redhat-rpm-config-9.1.0-fcflags.patch
new file mode 100644
index 0000000..5b450d7
--- /dev/null
+++ b/redhat-rpm-config-9.1.0-fcflags.patch
@@ -0,0 +1,11 @@
+diff -up redhat-rpm-config-9.1.0/macros.fcflags redhat-rpm-config-9.1.0/macros
+--- redhat-rpm-config-9.1.0/macros.fcflags 2013-04-23 07:26:57.202073011 +0300
++++ redhat-rpm-config-9.1.0/macros 2013-04-23 07:29:21.401036883 +0300
+@@ -32,6 +32,7 @@
+ CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
+ CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
+ FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \
++ FCFLAGS="${FCFLAGS:-%optflags -I%_fmoddir}" ; export FCFLAGS ; \
+ LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS; \
+ for i in $(find . -name config.guess -o -name config.sub) ; do \
+ [ -f /usr/lib/rpm/redhat/$(basename $i) ] && %{__rm} -f $i && %{__cp} -fv /usr/lib/rpm/redhat/$(basename $i) $i ; \
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index 56873ea..8cd628d 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -55,6 +55,8 @@ Patch18: redhat-rpm-config-9.1.0-record-switches.patch
Patch19: redhat-rpm-config-9.1.0-configfoo.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=909788
Patch20: redhat-rpm-config-9.1.0-aarch64.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=914831
+Patch21: redhat-rpm-config-9.1.0-fcflags.patch
BuildArch: noarch
Requires: coreutils
Requires: perl-srpm-macros
@@ -89,6 +91,7 @@ Red Hat specific rpm configuration files.
%patch18 -p1
%patch19 -p1
%patch20 -p1
+%patch21 -p1
%build
@@ -112,6 +115,7 @@ rm -rf ${RPM_BUILD_ROOT}
%changelog
* Tue Apr 23 2013 Panu Matilainen <pmatilai at redhat.com> - 9.1.0-43
- Add optflags stack protector override for AArch64 (#909788)
+- Also set FCFLAGS from %%configure (#914831)
* Mon Apr 22 2013 Panu Matilainen <pmatilai at redhat.com> - 9.1.0-42
- Switch back to manual config.guess/sub copies for reproducability
More information about the scm-commits
mailing list