[mingw-boost: 33/48] mingw32 cmake fixes
epienbro
epienbro at fedoraproject.org
Wed Mar 7 15:45:24 UTC 2012
commit 33655e9bc61791e2d245402922f732857283a8fa
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date: Sat Jan 14 19:56:38 2012 +0100
mingw32 cmake fixes
boost-1.48.0-mingw32.patch | 39 +++++++++++++++++++++++++++++++++++++++
mingw32-boost.spec | 3 +++
2 files changed, 42 insertions(+), 0 deletions(-)
---
diff --git a/boost-1.48.0-mingw32.patch b/boost-1.48.0-mingw32.patch
new file mode 100644
index 0000000..2173fb2
--- /dev/null
+++ b/boost-1.48.0-mingw32.patch
@@ -0,0 +1,39 @@
+--- ./libs/locale/src/CMakeLists.txt.orig 2012-01-14 19:28:01.424416587 +0100
++++ ./libs/locale/src/CMakeLists.txt 2012-01-14 19:42:42.501651039 +0100
+@@ -13,7 +13,11 @@
+ else (ICU_FOUND AND ICU_I18N_FOUND)
+ colormsg (CYAN "+-- ICU (unicode) not available for locale, disabling support.")
+ endif (ICU_FOUND AND ICU_I18N_FOUND)
+-
++
++if (WIN32)
++ add_definitions (-DBOOST_LOCALE_NO_POSIX_BACKEND=1)
++ set (WIN32_SOURCES win32/collate.cpp win32/converter.cpp win32/lcid.cpp win32/numeric.cpp win32/win_backend.cpp std/codecvt.cpp std/collate.cpp std/converter.cpp std/numeric.cpp std/std_backend.cpp util/gregorian.cpp)
++endif (WIN32)
+
+ add_definitions (-DBOOST_THREAD_NO_LIB=1)
+ boost_add_library (
+@@ -27,6 +31,7 @@
+ shared/localization_backend.cpp
+ shared/message.cpp
+ shared/mo_lambda.cpp
++ ${WIN32_SOURCES}
+ util/codecvt_converter.cpp
+ util/default_locale.cpp
+ util/info.cpp
+--- ./libs/timer/src/CMakeLists.txt.orig 2012-01-14 19:54:13.284819760 +0100
++++ ./libs/timer/src/CMakeLists.txt 2012-01-14 19:08:41.078415730 +0100
+@@ -11,4 +11,5 @@
+
+ SHARED_COMPILE_FLAGS "-DBOOST_TIMER_DYN_LINK=1"
+ STATIC_COMPILE_FLAGS "-DBOOST_TIMER_STATIC_LINK=1"
++ DEPENDS boost_system boost_chrono
+ )
+--- ./libs/chrono/src/CMakeLists.txt.orig 2012-01-14 19:06:46.825514697 +0100
++++ ./libs/chrono/src/CMakeLists.txt 2012-01-14 19:07:00.369740065 +0100
+@@ -12,4 +12,5 @@
+
+ SHARED_COMPILE_FLAGS "-DBOOST_CHRONO_DYN_LINK=1"
+ STATIC_COMPILE_FLAGS "-DBOOST_CHRONO_STATIC_LINK=1"
++ DEPENDS boost_system
+ )
diff --git a/mingw32-boost.spec b/mingw32-boost.spec
index a634f9c..884d8d2 100644
--- a/mingw32-boost.spec
+++ b/mingw32-boost.spec
@@ -62,6 +62,8 @@ Patch7: boost-1.48.0-foreach.patch
# https://svn.boost.org/trac/boost/ticket/6165
Patch8: boost-1.48.0-gcc47-pthreads.patch
+Patch9: boost-1.48.0-mingw32.patch
+
BuildArch: noarch
BuildRequires: cmake
@@ -115,6 +117,7 @@ sed 's/_FEDORA_SONAME/%{sonamever}/' %{PATCH1} | %{__patch} -p0 --fuzz=0
%patch6 -p1
%patch7 -p2
%patch8 -p0
+%patch9 -p0 -b .mingw32
%build
# Support for building tests.
More information about the scm-commits
mailing list