diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-07-13 10:43:10 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-07-13 10:57:34 +0200 |
| commit | 8ecf7e2259681b7a0d26766ea4500a7a6313f56d (patch) | |
| tree | c4fe1f6dccbe61e65a58f7fc5af1bf871828c471 /boost/makefile.mk | |
| parent | 8ad1d4443e67784a8c0d3c1a3a72f089cb0cd3ec (diff) | |
Backport boost fix for threading detection in GCC 4.7
See http://svn.boost.org/svn/boost/trunk r76133 "Fix threading detection in
GCC-4.7 experimental." Without it, BOOST_DISABLE_THREADS would be defined when
compiling with GCC 4.7, which in turn would cause
boost/smart_ptr/detail/sp_counted_base.hpp to include a single-thread--mode
boost/smart_ptr/detaul/sp_counted_base_nt.hpp which is not suitable in a
multi-threaded scenario.
Change-Id: Ia30a5c2c241e2e135858a5cab3dd855d05db50c8
Diffstat (limited to 'boost/makefile.mk')
| -rw-r--r-- | boost/makefile.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/boost/makefile.mk b/boost/makefile.mk index 719a536c8323..e223ddf63c68 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -80,6 +80,10 @@ PATCH_FILES += boost_1_44_0-gcc4.7.patch # Clang warnings: PATCH_FILES += boost_1_44_0-clang-warnings.patch +# Backport http://svn.boost.org/svn/boost/trunk r76133 "Fix threading detection +# in GCC-4.7 experimental": +PATCH_FILES += boost_1_44_0-gthreads.patch + ADDITIONAL_FILES= \ libs/thread/src/win32/makefile.mk \ libs/date_time/src/gregorian/makefile.mk |