From de9894a063ae0ed1ffe157e7629e223657dfad1d Mon Sep 17 00:00:00 2001 From: Bruno Turcksin Date: Wed, 25 Apr 2018 22:00:22 -0400 Subject: [PATCH] Add boost 1.67.0 (#7889) * Add boost 1.67.0 * Remove boost 1.67.0 release candidate and the associated patch --- .../builtin/packages/boost/array_binary_tree.patch | 12 ------------ var/spack/repos/builtin/packages/boost/package.py | 9 +++------ 2 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 var/spack/repos/builtin/packages/boost/array_binary_tree.patch diff --git a/var/spack/repos/builtin/packages/boost/array_binary_tree.patch b/var/spack/repos/builtin/packages/boost/array_binary_tree.patch deleted file mode 100644 index 51e1950528..0000000000 --- a/var/spack/repos/builtin/packages/boost/array_binary_tree.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/boost/graph/detail/array_binary_tree.hpp b/boost/graph/detail/array_binary_tree.hpp -index e59da9e..fd403d1 100644 ---- a/boost/graph/detail/array_binary_tree.hpp -+++ b/boost/graph/detail/array_binary_tree.hpp -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - - namespace boost { - diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index 09e71023b1..fb1ade8bcc 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -46,10 +46,10 @@ class Boost(Package): branch='develop', submodules=True) - version('1.67.0.b1', '3423a4a3ec5297051fd27091864630e2dce4c159', - url='https://dl.bintray.com/boostorg/beta/1.67.0.beta.1/source/boost_1_67_0_b1.tar.gz') + version('1.67.0', '694ae3f4f899d1a80eb7a3b31b33be73c423c1ae', + url='https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_67_0.tar.bz2') version('1.66.0', 'b6b284acde2ad7ed49b44e856955d7b1ea4e9459', - url='https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.bz2', preferred=True) + url='https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.bz2') version('1.65.1', '41d7542ce40e171f3f7982aff008ff0d', url='https://dl.bintray.com/boostorg/release/1.65.1/source/boost_1_65_1.tar.bz2') version('1.65.0', '5512d3809801b0a1b9dd58447b70915d', @@ -153,9 +153,6 @@ class Boost(Package): conflicts('+taggedlayout', when='+versionedlayout') - # temporary fix https://svn.boost.org/trac10/ticket/13505 - patch('array_binary_tree.patch', when='@1.67.0.b1') - # Patch fix from https://svn.boost.org/trac/boost/ticket/11856 patch('boost_11856.patch', when='@1.60.0%gcc@4.4.7')