[simspark] fix compilation under gcc 4.7
Hedayat Vatankhah
hedayat at fedoraproject.org
Thu Feb 16 11:57:44 UTC 2012
commit d06750bc687b439cdb77cc7547a7fe4e7581a6a5
Author: Hedayat Vatankhah <hedayat.fwd at gmail.com>
Date: Thu Feb 16 15:27:16 2012 +0330
fix compilation under gcc 4.7
simspark-0.2.2-gcc4.7fix.patch | 12 ++++++++++++
simspark.spec | 7 ++++++-
2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/simspark-0.2.2-gcc4.7fix.patch b/simspark-0.2.2-gcc4.7fix.patch
new file mode 100644
index 0000000..8e895e8
--- /dev/null
+++ b/simspark-0.2.2-gcc4.7fix.patch
@@ -0,0 +1,12 @@
+diff -up simspark-0.2.2/lib/salt/gmath.h.gcc4.7fix simspark-0.2.2/lib/salt/gmath.h
+--- simspark-0.2.2/lib/salt/gmath.h.gcc4.7fix 2012-02-16 15:18:02.720627323 +0330
++++ simspark-0.2.2/lib/salt/gmath.h 2012-02-16 15:18:24.423908724 +0330
+@@ -226,7 +226,7 @@ f_inline bool gIsFinite(TYPE f)
+ assert(std::numeric_limits<TYPE>::has_infinity);
+ return (std::numeric_limits<double>::infinity() != f);
+ #else
+- return isfinite(f);
++ return std::isfinite(f);
+ #endif
+ }
+
diff --git a/simspark.spec b/simspark.spec
index e9b39a6..9b5a0ce 100644
--- a/simspark.spec
+++ b/simspark.spec
@@ -1,6 +1,6 @@
Name: simspark
Version: 0.2.2
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Spark physical simulation system
Group: Development/Libraries
@@ -11,6 +11,7 @@ Patch0: %{name}-confscript-mlibfix.patch
# Applied upstream
Patch1: %{name}-odefix.patch
Patch2: %{name}-0.2.2-logviewerfix.patch
+Patch3: %{name}-0.2.2-gcc4.7fix.patch
BuildRequires: cmake boost-devel ruby ruby-devel SDL-devel tex(latex)
BuildRequires: ode-devel libGL-devel DevIL-devel freetype-devel libGLU-devel
@@ -40,6 +41,7 @@ developing applications that use %{name}.
%patch0 -p1 -b .mlibfix
%patch1 -p1 -b .odefix
%patch2 -p1 -b .logviewerfix
+%patch3 -p1 -b .gcc4.7fix
%build
mkdir build
@@ -81,6 +83,9 @@ rm -rf %{buildroot}/%{_datadir}/doc
%doc doc/devel/howtos doc/devel/manual.pdf
%changelog
+* Thu Feb 16 2012 Hedayat Vatankhah <hedayat.fwd+rpmchlog at gmail.com> - 0.2.2-8
+- fix compilation under gcc 4.7
+
* Wed Feb 08 2012 Bohuslav Kabrda <bkabrda at redhat.com> - 0.2.2-7
- Rebuilt for Ruby 1.9.3.
More information about the scm-commits
mailing list