diff --git a/Toolchain-mingw32.cmake b/Toolchain-mingw32.cmake index 66ef563..8b94488 100644 --- a/Toolchain-mingw32.cmake +++ b/Toolchain-mingw32.cmake @@ -23,3 +23,9 @@ SET(CMAKE_RC_COMPILER /usr/bin/i686-pc-mingw32-windres) # override boost library suffix which defaults to -mgw SET(Boost_COMPILER -gcc46) + +# These are needed for compiling lapack (RHBZ #753906) +SET(CMAKE_Fortran_COMPILER /usr/bin/i686-pc-mingw32-gfortran) +SET(CMAKE_AR /usr/bin/i686-pc-mingw32-ar) +SET(CMAKE_RANLIB /usr/bin/i686-pc-mingw32-ranlib) + diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 1ed4448..62dd72f 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -2,7 +2,7 @@ Name: mingw32-filesystem Version: 69 -Release: 8%{?dist} +Release: 9%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -191,6 +191,9 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32 %changelog +* Wed Nov 16 2011 Erik van Pienbroek - 69-9 +- Added various definitions to the CMake toolchain file (RHBZ #753906) + * Tue Aug 02 2011 Kalev Lember - 69-8 - Added avicap32.dll and psapi.dll to the list of Win32 default DLLs (thanks to Farkas Levente)