From 8ff8b7476c0af47bfb1bd9be445ae85bc32a9d2c Mon Sep 17 00:00:00 2001 From: David Hows Date: Fri, 13 Oct 2017 05:51:39 +1100 Subject: [PATCH] Add the option for a versioned layout to boost (#5709) --- var/spack/repos/builtin/packages/boost/package.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index 14f4a7f9ad7..b597136092c 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -137,6 +137,8 @@ class Boost(Package): description="Build the Boost Graph library") variant('taggedlayout', default=False, description="Augment library names with build options") + variant('versionedlayout', default=False, + description="Augment library layout with versioned subdirs") depends_on('icu4c', when='+icu') depends_on('python', when='+python') @@ -144,6 +146,8 @@ class Boost(Package): depends_on('bzip2', when='+iostreams') depends_on('zlib', when='+iostreams') + conflicts('+taggedlayout', when='+versionedlayout') + # Patch fix from https://svn.boost.org/trac/boost/ticket/11856 patch('boost_11856.patch', when='@1.60.0%gcc@4.4.7') @@ -266,6 +270,8 @@ def determine_b2_options(self, spec, options): if '+taggedlayout' in spec: layout = 'tagged' + elif '+versionedlayout' in spec: + layout = 'versioned' else: if len(threadingOpts) > 1: raise RuntimeError("Cannot build both single and " +