fix compilation under gcc 4.7

This commit is contained in:
Hedayat Vatankhah 2012-02-16 15:27:16 +03:30
parent ad43491a33
commit d06750bc68
2 changed files with 18 additions and 1 deletions

View File

@ -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
}

View File

@ -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@gmail.com> - 0.2.2-8
- fix compilation under gcc 4.7
* Wed Feb 08 2012 Bohuslav Kabrda <bkabrda@redhat.com> - 0.2.2-7
- Rebuilt for Ruby 1.9.3.