[mingw-boost] fix patch, package new files
sailer
sailer at fedoraproject.org
Tue Jul 1 14:56:56 UTC 2014
commit 94a6fca0f554fc426e4cdd0453e55aa58cb9075f
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date: Tue Jul 1 16:56:31 2014 +0200
fix patch, package new files
boost-include-intrin-h-on-mingw-w64.patch | 23 +++--------------------
mingw-boost.spec | 10 ++++++++++
2 files changed, 13 insertions(+), 20 deletions(-)
---
diff --git a/boost-include-intrin-h-on-mingw-w64.patch b/boost-include-intrin-h-on-mingw-w64.patch
index d5b57a4..a04bd64 100644
--- a/boost-include-intrin-h-on-mingw-w64.patch
+++ b/boost-include-intrin-h-on-mingw-w64.patch
@@ -1,31 +1,14 @@
--- boost/detail/interlocked.hpp.interlocked 2012-12-11 15:42:26.000000000 +0100
+++ boost/detail/interlocked.hpp 2013-07-21 15:22:56.082346444 +0200
-@@ -69,9 +69,9 @@
+@@ -92,9 +92,9 @@
# define BOOST_INTERLOCKED_EXCHANGE_POINTER(dest,exchange) \
((void*)BOOST_INTERLOCKED_EXCHANGE((long*)(dest),(long)(exchange)))
-#elif defined( BOOST_MSVC ) || defined( BOOST_INTEL_WIN )
+#elif defined( BOOST_MSVC ) || defined( BOOST_INTEL_WIN ) || defined( __MINGW64_VERSION_MAJOR )
--#if defined( BOOST_MSVC ) && BOOST_MSVC >= 1600
-+#if ( defined( BOOST_MSVC ) && BOOST_MSVC >= 1600 ) || defined( __MINGW64_VERSION_MAJOR )
+-#if defined( BOOST_MSVC ) && BOOST_MSVC >= 1500
++#if ( defined( BOOST_MSVC ) && BOOST_MSVC >= 1500 ) || defined( __MINGW64_VERSION_MAJOR )
#include <intrin.h>
-@@ -93,12 +93,16 @@
-
- #endif
-
-+# if defined( BOOST_MSVC )
-+
- # pragma intrinsic( _InterlockedIncrement )
- # pragma intrinsic( _InterlockedDecrement )
- # pragma intrinsic( _InterlockedCompareExchange )
- # pragma intrinsic( _InterlockedExchange )
- # pragma intrinsic( _InterlockedExchangeAdd )
-
-+# endif
-+
- # if defined(_M_IA64) || defined(_M_AMD64)
-
- extern "C" void* __cdecl _InterlockedCompareExchangePointer( void* volatile *, void*, void* );
diff --git a/mingw-boost.spec b/mingw-boost.spec
index e66a6a8..03c746d 100644
--- a/mingw-boost.spec
+++ b/mingw-boost.spec
@@ -274,6 +274,8 @@ mv $RPM_BUILD_ROOT%{mingw64_libdir}/*.dll $RPM_BUILD_ROOT%{mingw64_bindir}
%{mingw32_bindir}/libboost_chrono-mt.dll
%{mingw32_bindir}/libboost_context.dll
%{mingw32_bindir}/libboost_context-mt.dll
+%{mingw32_bindir}/libboost_coroutine.dll
+%{mingw32_bindir}/libboost_coroutine-mt.dll
%{mingw32_bindir}/libboost_date_time.dll
%{mingw32_bindir}/libboost_date_time-mt.dll
%{mingw32_bindir}/libboost_filesystem.dll
@@ -327,6 +329,8 @@ mv $RPM_BUILD_ROOT%{mingw64_libdir}/*.dll $RPM_BUILD_ROOT%{mingw64_bindir}
%{mingw32_libdir}/libboost_chrono-mt.dll.a
%{mingw32_libdir}/libboost_context.dll.a
%{mingw32_libdir}/libboost_context-mt.dll.a
+%{mingw32_libdir}/libboost_coroutine.dll.a
+%{mingw32_libdir}/libboost_coroutine-mt.dll.a
%{mingw32_libdir}/libboost_date_time.dll.a
%{mingw32_libdir}/libboost_date_time-mt.dll.a
%{mingw32_libdir}/libboost_filesystem.dll.a
@@ -382,6 +386,7 @@ mv $RPM_BUILD_ROOT%{mingw64_libdir}/*.dll $RPM_BUILD_ROOT%{mingw64_bindir}
%{mingw32_libdir}/libboost_chrono-mt.a
%{mingw32_libdir}/libboost_context.a
%{mingw32_libdir}/libboost_context-mt.a
+%{mingw32_libdir}/libboost_coroutine.a
%{mingw32_libdir}/libboost_coroutine-mt.a
%{mingw32_libdir}/libboost_date_time.a
%{mingw32_libdir}/libboost_date_time-mt.a
@@ -446,6 +451,8 @@ mv $RPM_BUILD_ROOT%{mingw64_libdir}/*.dll $RPM_BUILD_ROOT%{mingw64_bindir}
%{mingw64_bindir}/libboost_chrono-mt.dll
%{mingw64_bindir}/libboost_context.dll
%{mingw64_bindir}/libboost_context-mt.dll
+%{mingw64_bindir}/libboost_coroutine.dll
+%{mingw64_bindir}/libboost_coroutine-mt.dll
%{mingw64_bindir}/libboost_date_time.dll
%{mingw64_bindir}/libboost_date_time-mt.dll
%{mingw64_bindir}/libboost_filesystem.dll
@@ -499,6 +506,8 @@ mv $RPM_BUILD_ROOT%{mingw64_libdir}/*.dll $RPM_BUILD_ROOT%{mingw64_bindir}
%{mingw64_libdir}/libboost_chrono-mt.dll.a
%{mingw64_libdir}/libboost_context.dll.a
%{mingw64_libdir}/libboost_context-mt.dll.a
+%{mingw64_libdir}/libboost_coroutine.dll.a
+%{mingw64_libdir}/libboost_coroutine-mt.dll.a
%{mingw64_libdir}/libboost_date_time.dll.a
%{mingw64_libdir}/libboost_date_time-mt.dll.a
%{mingw64_libdir}/libboost_filesystem.dll.a
@@ -554,6 +563,7 @@ mv $RPM_BUILD_ROOT%{mingw64_libdir}/*.dll $RPM_BUILD_ROOT%{mingw64_bindir}
%{mingw64_libdir}/libboost_chrono-mt.a
%{mingw64_libdir}/libboost_context.a
%{mingw64_libdir}/libboost_context-mt.a
+%{mingw64_libdir}/libboost_coroutine.a
%{mingw64_libdir}/libboost_coroutine-mt.a
%{mingw64_libdir}/libboost_date_time.a
%{mingw64_libdir}/libboost_date_time-mt.a
More information about the scm-commits
mailing list