summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorDavid Hows <howsdav@gmail.com>2017-10-13 05:51:39 +1100
committerChristoph Junghans <christoph.junghans@gmail.com>2017-10-12 12:51:39 -0600
commit8ff8b7476c0af47bfb1bd9be445ae85bc32a9d2c (patch)
treec7c394a7ea9872b4a529f364ea6fb780e903ea8d /var
parent36ed96e7dda0e45d0d66acdeb2b4a2b7f8fa0d5c (diff)
downloadspack-8ff8b7476c0af47bfb1bd9be445ae85bc32a9d2c.tar.gz
spack-8ff8b7476c0af47bfb1bd9be445ae85bc32a9d2c.tar.bz2
spack-8ff8b7476c0af47bfb1bd9be445ae85bc32a9d2c.tar.xz
spack-8ff8b7476c0af47bfb1bd9be445ae85bc32a9d2c.zip
Add the option for a versioned layout to boost (#5709)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/boost/package.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py
index 14f4a7f9ad..b597136092 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 @@ class Boost(Package):
if '+taggedlayout' in spec:
layout = 'tagged'
+ elif '+versionedlayout' in spec:
+ layout = 'versioned'
else:
if len(threadingOpts) > 1:
raise RuntimeError("Cannot build both single and " +