[frama-c] Set LDFLAGS in a less destructive way (bz 1105265).
Jerry James
jjames at fedoraproject.org
Thu Jun 26 21:41:22 UTC 2014
commit fd1f8d2313711342a7a1c8202705f3318afa937e
Author: Jerry James <jamesjer at betterlinux.com>
Date: Thu Jun 26 15:41:22 2014 -0600
Set LDFLAGS in a less destructive way (bz 1105265).
frama-c.spec | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/frama-c.spec b/frama-c.spec
index e2a233a..4bae682 100644
--- a/frama-c.spec
+++ b/frama-c.spec
@@ -16,7 +16,7 @@
Name: frama-c
Version: 1.10
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Framework for source code analysis of C software
# Licensing breakdown in source file frama-c-1.6-licensing
@@ -153,6 +153,9 @@ rm -f ocamlgraph.tar.gz
# Enable debuginfo
sed -i 's/ -pack/ -g&/;s/^OPT.*=/& -g/' src/wp/qed/src/Makefile
+# Link with the Fedora LDFLAGS
+sed -i "/OLINKFLAGS/s/-linkall/& -ccopt $RPM_LD_FLAGS/" Makefile
+
# Preserve timestamps when installing
sed -ri 's/^CP[[:blank:]]+=.*/& -p/' share/Makefile.common
@@ -166,9 +169,7 @@ sed -i 's/0\.82/0.83/g' configure src/wp/configure
# This option prints the actual make commands so we can see what's
# happening (eg: for debugging the spec file)
%configure --enable-verbosemake
-# Harden the build due to network use
-make \
-OLINKFLAGS="-I +zarith -I +ocamlgraph -I +lablgtk2 -ccopt -Wl,-z,relro,-z,now"
+make
%install
# Prevent rebuilds containing the buildroot when installing
@@ -278,6 +279,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_xemacs_sitelispdir}/acsl.el
%changelog
+* Thu Jun 26 2014 Jerry James <loganjerry at gmail.com> - 1.10-7
+- Set LDFLAGS in a less destructive way (bz 1105265)
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list