diff --git a/glm-0.9.3.4-secondary.patch b/glm-0.9.3.4-secondary.patch new file mode 100644 index 0000000..9646771 --- /dev/null +++ b/glm-0.9.3.4-secondary.patch @@ -0,0 +1,13 @@ +diff -up glm-0.9.3.4/CMakeLists.txt.secondary glm-0.9.3.4/CMakeLists.txt +--- glm-0.9.3.4/CMakeLists.txt.secondary 2012-09-04 13:03:58.000000000 +0200 ++++ glm-0.9.3.4/CMakeLists.txt 2012-09-04 13:04:14.000000000 +0200 +@@ -53,9 +53,6 @@ elseif(NOT GLM_TEST_ENABLE_SIMD) + + add_definitions(-DGLM_FORCE_PURE) + +- if(CMAKE_COMPILER_IS_GNUCXX) +- add_definitions(-mfpmath=387) +- endif() + endif() + + option(GLM_TEST_ENABLE_FAST_MATH "Enable fast math optimizations" OFF) diff --git a/glm.spec b/glm.spec index 7ec637c..6591f66 100644 --- a/glm.spec +++ b/glm.spec @@ -3,13 +3,14 @@ Name: glm Version: 0.9.3.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ mathematics library for graphics programming License: MIT URL: http://glm.g-truc.net/ Source0: http://downloads.sourceforge.net/ogl-math/%{name}-%{version}/%{name}-%{version}.zip Patch0: glm-no-gcc-integer-log2.patch +Patch1: glm-0.9.3.4-secondary.patch BuildRequires: cmake %description @@ -66,6 +67,9 @@ sed -i 's/\r//' doc/html/tabs.css sed -i 's/\r//' doc/html/doxygen.css %patch0 -p1 +%ifnarch %{ix86} x86_64 +%patch1 -p1 -b .secondary +%endif %build mkdir build @@ -94,6 +98,9 @@ find $RPM_BUILD_ROOT -name CMakeLists.txt -exec rm -f {} ';' %doc doc/html/ %changelog +* Tue Sep 04 2012 Dan Horák - 0.9.3.4-2 +- fix build on non-x86 arches + * Sun Sep 02 2012 Joonas Sarajärvi - 0.9.3.4-1 - Update to a new upstream version - Work around problems in glm::log2 for integers