diff options
| -rw-r--r-- | var/spack/repos/builtin/packages/boost/boost_10125.patch | 51 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/boost/package.py | 6 |
2 files changed, 2 insertions, 55 deletions
diff --git a/var/spack/repos/builtin/packages/boost/boost_10125.patch b/var/spack/repos/builtin/packages/boost/boost_10125.patch deleted file mode 100644 index 71cfaa871e..0000000000 --- a/var/spack/repos/builtin/packages/boost/boost_10125.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- 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 766298c940..a94a5d6e7a 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -153,14 +153,12 @@ class Boost(Package): patch('python_jam.patch', when='@1.56.0: ^python@3:') patch('python_jam_pre156.patch', when='@:1.55.0 ^python@3:') - # Patch fix from https://svn.boost.org/trac/boost/ticket/10125 - patch('boost_10125.patch', when='@1.55.0%gcc@5.0:5.9') - # Patch fix for IBM XL compiler patch('xl_1_62_0_le.patch', when='@1.62.0%xl_r') patch('xl_1_62_0_le.patch', when='@1.62.0%xl') - patch('call_once_variadic.patch', when='@:1.55.9999%gcc@5:') + # Patch fix from https://svn.boost.org/trac/boost/ticket/10125 + patch('call_once_variadic.patch', when='@1.55.0:1.55.9999%gcc@5.0:5.9') # Patch fix for PGI compiler patch('boost_1.63.0_pgi.patch', when='@1.63.0%pgi') |