diff options
| author | Andrey Prokopenko <aprokop@users.noreply.github.com> | 2017-01-13 11:43:50 -0500 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2017-01-13 08:43:50 -0800 |
| commit | 1128922b444d3390538b2da65937263d9c8a0b50 (patch) | |
| tree | 20d30cdf887da733972701ffa8517538be96174d | |
| parent | cd511791d19929dbd5ce4916e72e194f9b9f131f (diff) | |
| download | spack-1128922b444d3390538b2da65937263d9c8a0b50.tar.gz spack-1128922b444d3390538b2da65937263d9c8a0b50.tar.bz2 spack-1128922b444d3390538b2da65937263d9c8a0b50.tar.xz spack-1128922b444d3390538b2da65937263d9c8a0b50.zip | |
boost: fixing boost-1.55.0 for gcc-5 (#2822)
boost-1.55.0 requires patching when compiling with gcc-5. See these
threads:
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=197594
https://svn.boost.org/trac/boost/ticket/10125
Fixes #2821.
| -rw-r--r-- | var/spack/repos/builtin/packages/boost/boost_10125.patch | 51 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/boost/package.py | 3 |
2 files changed, 54 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/boost/boost_10125.patch b/var/spack/repos/builtin/packages/boost/boost_10125.patch new file mode 100644 index 0000000000..71cfaa871e --- /dev/null +++ b/var/spack/repos/builtin/packages/boost/boost_10125.patch @@ -0,0 +1,51 @@ +--- a/boost/thread/pthread/once.hpp ++++ b/boost/thread/pthread/once.hpp +@@ -42,7 +42,7 @@ namespace boost + } + + #ifdef BOOST_THREAD_PROVIDES_ONCE_CXX11 +-#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES ++#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) + template<typename Function, class ...ArgTypes> + inline void call_once(once_flag& flag, BOOST_THREAD_RV_REF(Function) f, BOOST_THREAD_RV_REF(ArgTypes)... args); + #else +@@ -65,7 +65,7 @@ namespace boost + private: + volatile thread_detail::uintmax_atomic_t epoch; + +-#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES ++#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) + template<typename Function, class ...ArgTypes> + friend void call_once(once_flag& flag, BOOST_THREAD_RV_REF(Function) f, BOOST_THREAD_RV_REF(ArgTypes)... args); + #else +@@ -118,7 +118,7 @@ namespace boost + // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2444.html + + +-#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES ++#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) + + + template<typename Function, class ...ArgTypes> +--- a/boost/thread/pthread/once_atomic.hpp ++++ b/boost/thread/pthread/once_atomic.hpp +@@ -115,7 +115,7 @@ namespace boost + #endif + + +-#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES ++#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) + + template<typename Function, class ...ArgTypes> + inline void call_once(once_flag& flag, BOOST_THREAD_RV_REF(Function) f, BOOST_THREAD_RV_REF(ArgTypes)... args) +--- a/boost/thread/win32/once.hpp ++++ b/boost/thread/win32/once.hpp +@@ -227,7 +227,7 @@ namespace boost + } + } + +-#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES ++#if !defined BOOST_NO_CXX11_VARIADIC_TEMPLATES && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) + //#if defined(BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR) + inline void call_once(once_flag& flag, void (*f)()) + { diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index fa3f66d8f4..c31e5fc9df 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -130,6 +130,9 @@ class Boost(Package): # Patch fix from https://svn.boost.org/trac/boost/ticket/11856 patch('boost_11856.patch', when='@1.60.0%gcc@4.4.7') + # Patch fix from https://svn.boost.org/trac/boost/ticket/10125 + patch('boost_10125.patch', when='@1.55.0%gcc@5.0:5.9') + def url_for_version(self, version): """ Handle Boost's weird URLs, |