zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add the option for a versioned layout to boost (#5709)

Browse Source
This commit is contained in:
David Hows 2017-10-13 05:51:39 +11:00 committed by Christoph Junghans
parent 36ed96e7dd
commit 8ff8b7476c
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
var/spack/repos/builtin/packages/boost/package.py
View File

@ -137,6 +137,8 @@ class Boost(Package):
description="Build the Boost Graph library") description="Build the Boost Graph library")
variant('taggedlayout', default=False, variant('taggedlayout', default=False,
description="Augment library names with build options") 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('icu4c', when='+icu')
depends_on('python', when='+python') depends_on('python', when='+python')
@ -144,6 +146,8 @@ class Boost(Package):
depends_on('bzip2', when='+iostreams') depends_on('bzip2', when='+iostreams')
depends_on('zlib', when='+iostreams') depends_on('zlib', when='+iostreams')
conflicts('+taggedlayout', when='+versionedlayout')
# Patch fix from https://svn.boost.org/trac/boost/ticket/11856 # Patch fix from https://svn.boost.org/trac/boost/ticket/11856
patch('boost_11856.patch', when='@1.60.0%gcc@4.4.7') 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: if '+taggedlayout' in spec:
layout = 'tagged' layout = 'tagged'
elif '+versionedlayout' in spec:
layout = 'versioned'
else: else:
if len(threadingOpts) > 1: if len(threadingOpts) > 1:
raise RuntimeError("Cannot build both single and " + raise RuntimeError("Cannot build both single and " +