diff options
| author | Jim Galarowicz <jeg@krellinst.org> | 2018-11-09 15:35:11 -0600 |
|---|---|---|
| committer | Gregory Lee <lee218@llnl.gov> | 2018-11-09 13:35:11 -0800 |
| commit | 5dc0b657194ee780d8aa7696169c57c8071f91e5 (patch) | |
| tree | 17216c00e2c60a5b25986180fc43b1b2c9727a68 /var | |
| parent | 88a3393462fbb95b8bf2f1ecd071785c6ff37fbf (diff) | |
| download | spack-5dc0b657194ee780d8aa7696169c57c8071f91e5.tar.gz spack-5dc0b657194ee780d8aa7696169c57c8071f91e5.tar.bz2 spack-5dc0b657194ee780d8aa7696169c57c8071f91e5.tar.xz spack-5dc0b657194ee780d8aa7696169c57c8071f91e5.zip | |
Update Dyninst package file for TBB dependency (#9728)
* Update Dyninst package file for TBB dependency
Dyninst master and 10.0 release
versions require the tbb package. This mod
updates the tbb versions adding the one that
dyninst uses and adds the required spack package
changes to dyninst/package.py.
* Put new version of tbb in proper location, per reviewer comment.
* Only depend on tbb if building the development version.
* Changes for the release of Dyninst 10.0.0
Diffstat (limited to 'var')
5 files changed, 12 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py index d800df4bfa..b30a4a6649 100644 --- a/var/spack/repos/builtin/packages/cbtf-krell/package.py +++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py @@ -57,8 +57,7 @@ class CbtfKrell(CMakePackage): # For Dyninst depends_on("dyninst@develop", when='@develop') - # This will change to dyninst@10.0 when it is released - depends_on("dyninst@develop", when='@1.9.1.0:9999') + depends_on("dyninst@10:", when='@1.9.1.0:9999') # For MRNet depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti', type=('build', 'link', 'run')) diff --git a/var/spack/repos/builtin/packages/dyninst/package.py b/var/spack/repos/builtin/packages/dyninst/package.py index 5b0aea454e..9d9ab52669 100644 --- a/var/spack/repos/builtin/packages/dyninst/package.py +++ b/var/spack/repos/builtin/packages/dyninst/package.py @@ -14,6 +14,7 @@ class Dyninst(Package): git = "https://github.com/dyninst/dyninst.git" version('develop', branch='master') + version('10.0.0', tag='v10.0.0') version('9.3.2', tag='v9.3.2') version('9.3.0', tag='v9.3.0') version('9.2.0', tag='v9.2.0') @@ -40,6 +41,8 @@ class Dyninst(Package): depends_on("libdwarf", when='@:9') depends_on("boost@1.42:") depends_on('libiberty+pic') + depends_on("tbb@2018.6:", when='@develop') + depends_on("tbb@2018.6:", when='@10:') depends_on('cmake', type='build') patch('stat_dysect.patch', when='+stat_dysect') @@ -72,7 +75,11 @@ class Dyninst(Package): libdwarf.lib, "libdwarf." + dso_suffix)) # For @develop + use elfutils libdw, libelf is an abstraction # we are really using elfutils here - if spec.satisfies('@develop'): + if spec.satisfies('@develop') or spec.satisfies('@10:'): + tbb = spec['tbb'].prefix + args.append('-DTBB_INCLUDE_DIRS=%s' % tbb.include) + args.append('-DTBB_LIBRARIES=%s' % join_path( + tbb.lib, "libtbb." + dso_suffix)) args.append('-DLIBDWARF_INCLUDE_DIR=%s' % libelf.include) args.append('-DLIBDWARF_LIBRARIES=%s' % join_path( libelf.lib, "libdw." + dso_suffix)) diff --git a/var/spack/repos/builtin/packages/intel-tbb/package.py b/var/spack/repos/builtin/packages/intel-tbb/package.py index a6a127ece2..55eaa995ac 100644 --- a/var/spack/repos/builtin/packages/intel-tbb/package.py +++ b/var/spack/repos/builtin/packages/intel-tbb/package.py @@ -19,6 +19,7 @@ class IntelTbb(Package): # See url_for_version() below. version('2019', '2119f1db2f905dc5b423482d7689b7d6') + version('2018.6', '9a0f78db4f72356068b00f29f54ee6bc') version('2018.5', 'ff3ae09f8c23892fbc3008c39f78288f') version('2018.4', '5e2e6ba0e25624a94331c945856551c2') version('2018.3', 'cd2e136598ffa5c136f077ee85a35b4c') diff --git a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py index afa480a8f3..c70013562c 100644 --- a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py @@ -93,8 +93,7 @@ class OpenspeedshopUtils(CMakePackage): depends_on("boost@1.66.0:") depends_on("dyninst@develop", when='@develop') - # This will change to version dyninst@10.0 when it is released - depends_on("dyninst@develop", when='@2.3.1.3:9999') + depends_on("dyninst@10:", when='@2.3.1.3:9999') depends_on("python", when='@develop', type=('build', 'run')) depends_on("python@2.7.14:2.7.15", when='@2.3.1.3:9999', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py index 90d55b168a..0d8957f0ac 100644 --- a/var/spack/repos/builtin/packages/openspeedshop/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop/package.py @@ -88,8 +88,7 @@ class Openspeedshop(CMakePackage): depends_on("boost@1.66.0:") depends_on("dyninst@develop", when='@develop') - # This will change to version dyninst@10.0 when it is released - depends_on("dyninst@develop", when='@2.3.1.3:9999') + depends_on("dyninst@10:", when='@2.3.1.3:9999') depends_on("python", when='@develop', type=('build', 'run')) depends_on("python@2.7.14:2.7.15", when='@2.3.1.3:9999', type=('build', 'run')) |