commit 1626ca006437a4180483a9a11b390e06ed0c7292
Merge: 94aa851 29a8d94
Author: Ivan Romanov <dr...@land.ru>
Date: Mon Mar 26 01:00:04 2012 +0600
Merge branch 'f15' into f16
Conflicts:
mingw32-filesystem.spec
Toolchain-mingw32.cmake | 2 ++
mingw32-filesystem.spec | 5 ++++-
2 files changed, 6 insertions(+), 1 deletions(-)
---
diff --cc Toolchain-mingw32.cmake
index 9a575d0,c000ca8..2c3c9e1
--- a/Toolchain-mingw32.cmake
+++ b/Toolchain-mingw32.cmake
@@@ -20,12 -20,8 +20,14 @@@ SET(QT_LIBRARY_DIR ${CMAKE_FIND_ROOT_PA
# set the resource compiler (RHBZ #652435)
SET(CMAKE_RC_COMPILER /usr/bin/i686-pc-mingw32-windres)
+ SET(CMAKE_RC_COMPILE_OBJECT
+ "<CMAKE_RC_COMPILER> <FLAGS> <DEFINES> -O coff -o <OBJECT> <SOURCE>")
# override boost library suffix which defaults to -mgw
-SET(Boost_COMPILER -gcc45)
+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:FILEPATH /usr/bin/i686-pc-mingw32-ar)
+SET(CMAKE_RANLIB:FILEPATH /usr/bin/i686-pc-mingw32-ranlib)
+
diff --cc mingw32-filesystem.spec
index 7018810,31517aa..3e590c1
--- a/mingw32-filesystem.spec
+++ b/mingw32-filesystem.spec
@@@ -2,7 -2,7 +2,7 @@@
Name: mingw32-filesystem
Version: 69
- Release: 11%{?dist}
-Release: 5%{?dist}
++Release: 12%{?dist}
Summary: MinGW base filesystem and environment
Group: Development/Libraries
@@@ -158,36 -191,17 +158,39 @@@ install -m 644 %{SOURCE8} $RPM_BUILD_RO
%changelog
-* Mon Mar 26 2012 Ivan Romanov <dr...@land.ru> - 69.5
++* Mon Mar 26 2012 Ivan Romanov <dr...@land.ru> - 69-12
+ - windres options for cmake (RHBZ #652435)
+
-* Sat Nov 12 2011 Erik van Pienbroek <epien...@fedoraproject.org> - 69-4
-- Backported the changes from f16/master up to 69-8 excluding 69-3
- This contains a more complete list of Win32 default DLLs and
- a bugfix for the dependency extractor with upper case dll names
+* Sun Feb 5 2012 Erik van Pienbroek <epien...@fedoraproject.org> - 69-11
+- Use a more complete list of Win32 default dlls based on the
+ dlls exported by wine (thanks to Levente Farkas). RHBZ #787486
-* Fri Jul 1 2011 Erik van Pienbroek <epien...@fedoraproject.org> - 69-3
+* Tue Nov 22 2011 Erik van Pienbroek <epien...@fedoraproject.org> - 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
+
+* Wed Nov 16 2011 Erik van Pienbroek <epien...@fedoraproject.org> - 69-9
+- Added various definitions to the CMake toolchain file (RHBZ #753906)
+
+* Tue Aug 02 2011 Kalev Lember <kalevlem...@gmail.com> - 69-8
+- Added avicap32.dll and psapi.dll to the list of Win32 default DLLs
+ (thanks to Farkas Levente)
+
+* Wed Jul 13 2011 Erik van Pienbroek <epien...@fedoraproject.org> - 69-7
+- Added glu32.dll and wsock32.dll to the list of Win32 default dll's
+
+* Wed Jul 6 2011 Erik van Pienbroek <epien...@fedoraproject.org> - 69-6
+- Use a more complete list of Win32 default dll's
+
+* Wed Jul 06 2011 Kalev Lember <kalevlem...@gmail.com> - 69-5
+- Fixed dep gen with upper case dll names
+
+* Fri Jul 1 2011 Erik van Pienbroek <epien...@fedoraproject.org> - 69-4
- The %%{_mingw32_qmake_qt4} macro pointed to an invalid mkspecs name. Fixed
+* Tue Jun 28 2011 Kalev Lember <ka...@smartlink.ee> - 69-3
+- Set Boost_COMPILER to -gcc46 in cmake toolchain file
+
* Sun May 29 2011 Kalev Lember <ka...@smartlink.ee> - 69-2
- Make sure the -debuginfo subpackages are mingw32- prefixed
even if the base package is mingw-
_______________________________________________
mingw mailing list
mingw@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/mingw
