From 2a5fde2ebb269d42c3b8b6bc63f885fb38aed0d4 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Wed, 11 Jan 2012 00:11:36 +0100 Subject: [PATCH] Set Boost_COMPILER to -gcc47 in cmake toolchain file --- Toolchain-mingw32.cmake | 2 +- mingw32-filesystem.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Toolchain-mingw32.cmake b/Toolchain-mingw32.cmake index 9a575d0..25f70d0 100644 --- a/Toolchain-mingw32.cmake +++ b/Toolchain-mingw32.cmake @@ -22,7 +22,7 @@ SET(QT_LIBRARY_DIR ${CMAKE_FIND_ROOT_PATH}/lib) SET(CMAKE_RC_COMPILER /usr/bin/i686-pc-mingw32-windres) # override boost library suffix which defaults to -mgw -SET(Boost_COMPILER -gcc46) +SET(Boost_COMPILER -gcc47) # These are needed for compiling lapack (RHBZ #753906) SET(CMAKE_Fortran_COMPILER /usr/bin/i686-pc-mingw32-gfortran) diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 3773eb9..940476e 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -2,7 +2,7 @@ Name: mingw32-filesystem Version: 69 -Release: 10%{?dist} +Release: 11%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -191,6 +191,9 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32 %changelog +* Tue Jan 10 2012 Erik van Pienbroek - 69-11 +- Set Boost_COMPILER to -gcc47 in cmake toolchain file + * Tue Nov 22 2011 Erik van Pienbroek - 69-10 - Fixed a small regression introduced by the previous release which caused an FTBFS for mingw32-matahari as indicated on the fedora-mingw mailing list