[mingw-boost: 39/48] reinstate the crono depends
epienbro
epienbro at fedoraproject.org
Wed Mar 7 15:45:55 UTC 2012
commit ceb12b36086dfa28d7ede56aaaf31147bc1a932a
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date: Sat Jan 14 22:59:19 2012 +0100
reinstate the crono depends
boost-1.48.0-mingw32.patch | 31 -------------------------------
mingw32-boost.spec | 4 ++++
2 files changed, 4 insertions(+), 31 deletions(-)
---
diff --git a/boost-1.48.0-mingw32.patch b/boost-1.48.0-mingw32.patch
index 2173fb2..f0aeb45 100644
--- a/boost-1.48.0-mingw32.patch
+++ b/boost-1.48.0-mingw32.patch
@@ -1,34 +1,3 @@
---- ./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 @@
diff --git a/mingw32-boost.spec b/mingw32-boost.spec
index 94ff842..2906fc0 100644
--- a/mingw32-boost.spec
+++ b/mingw32-boost.spec
@@ -65,6 +65,9 @@ Patch8: boost-1.48.0-gcc47-pthreads.patch
# https://svn.boost.org/trac/boost/ticket/6165
Patch9: boost-1.48.0-gcc47-winthreads.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=781751
+Patch10: boost-1.48.0-mingw32.patch
+
BuildArch: noarch
BuildRequires: cmake
@@ -119,6 +122,7 @@ sed 's/_FEDORA_SONAME/%{sonamever}/' %{PATCH1} | %{__patch} -p0 --fuzz=0
%patch7 -p2
%patch8 -p0
%patch9 -p0 -b .gcc47wt
+%patch10 -p0 -b .mingw32
%build
# Support for building tests.
More information about the scm-commits
mailing list