summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2016-03-29 05:14:41 -0700
committerTodd Gamblin <tgamblin@llnl.gov>2016-03-29 05:14:41 -0700
commit62ae830e49a02b78e614b88ecf01a6ad70367301 (patch)
tree607b04172a0ee631a8d272433aabbe7b1102ac36
parent275943d8df782c45ba6fc849852c2eb2009da4bd (diff)
parent981cefe8d3f4f73461789713726a9658498a5f14 (diff)
downloadspack-62ae830e49a02b78e614b88ecf01a6ad70367301.tar.gz
spack-62ae830e49a02b78e614b88ecf01a6ad70367301.tar.bz2
spack-62ae830e49a02b78e614b88ecf01a6ad70367301.tar.xz
spack-62ae830e49a02b78e614b88ecf01a6ad70367301.zip
Merge branch 'eschnett/boost-mpi-osx' of git://github.com/eschnett/spack into eschnett-eschnett/boost-mpi-osx
-rw-r--r--var/spack/repos/builtin/packages/boost/package.py13
1 files changed, 13 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py
index 82ce6fbb74..f889da21f2 100644
--- a/var/spack/repos/builtin/packages/boost/package.py
+++ b/var/spack/repos/builtin/packages/boost/package.py
@@ -2,6 +2,9 @@ from spack import *
import spack
import sys
+import os
+import sys
+
class Boost(Package):
"""Boost provides free peer-reviewed portable C++ source
libraries, emphasizing libraries that work well with the C++
@@ -173,6 +176,16 @@ class Boost(Package):
return threadingOpts
def install(self, spec, prefix):
+ # On Darwin, Boost expects the Darwin libtool. However, one of the
+ # dependencies may have pulled in Spack's GNU libtool, and these two are
+ # not compatible. We thus create a symlink to Darwin's libtool and add
+ # it at the beginning of PATH.
+ if sys.platform == 'darwin':
+ newdir = os.path.abspath('darwin-libtool')
+ mkdirp(newdir)
+ force_symlink('/usr/bin/libtool', join_path(newdir, 'libtool'))
+ env['PATH'] = newdir + ':' + env['PATH']
+
withLibs = list()
for lib in Boost.all_libs:
if "+{0}".format(lib) in spec: