rpms
/
redhat-rpm-config
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Also set FCFLAGS from %%configure (#914831)

This commit is contained in:
Panu Matilainen 2013-04-23 07:33:30 +03:00
parent 4b27de8d70
commit 234364ec2f
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
redhat-rpm-config-9.1.0-fcflags.patch Normal file
View File

@ -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 ; \

4
redhat-rpm-config.spec
View File

@ -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@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@redhat.com> - 9.1.0-42
- Switch back to manual config.guess/sub copies for reproducability