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

intel-xed and hpcviewer: adapt to new resource placement (#11676)

Browse Source 
Change 'destination' to 'placement' in the use of resource() for
intel-xed and hpcviewer.  Recent commits (1842873f and eb584d89)
changed the directory path for a resource and thus broke the build
for these packages.
This commit is contained in:
Mark W. Krentel 2019-06-13 02:53:30 -05:00 committed by Todd Gamblin
parent 4f2144a68e
commit aca1bfdb6a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
var/spack/repos/builtin/packages/hpcviewer/package.py
View File

@ -58,7 +58,7 @@ class Hpcviewer(Package):
version(ver, url=viewer_url(*key), sha256=viewer_sha[key]) version(ver, url=viewer_url(*key), sha256=viewer_sha[key])
resource(name='hpctraceviewer', url=trace_url(*key), resource(name='hpctraceviewer', url=trace_url(*key),
sha256=trace_sha[key], destination='TRACE', sha256=trace_sha[key], placement='TRACE',
when='@{0}'.format(ver)) when='@{0}'.format(ver))
depends_on('java@8', type=('build', 'run')) depends_on('java@8', type=('build', 'run'))
@ -73,7 +73,7 @@ def install(self, spec, prefix):
inst = Executable(join_path('.', 'install')) inst = Executable(join_path('.', 'install'))
inst(*args) inst(*args)
cd(join_path('TRACE', 'hpctraceviewer')) cd('TRACE')
inst = Executable(join_path('.', 'install')) inst = Executable(join_path('.', 'install'))
inst(*args) inst(*args)

6
var/spack/repos/builtin/packages/intel-xed/package.py
View File

@ -34,14 +34,14 @@ class IntelXed(Package):
version('develop', branch='master') version('develop', branch='master')
resource(name='mbuild', resource(name='mbuild',
git='https://github.com/intelxed/mbuild.git', git='https://github.com/intelxed/mbuild.git',
branch='master', destination='', branch='master', placement='mbuild',
when='@develop') when='@develop')
for (vers, xed_hash, mbuild_hash) in version_list: for (vers, xed_hash, mbuild_hash) in version_list:
version(vers, commit=xed_hash) version(vers, commit=xed_hash)
resource(name='mbuild', resource(name='mbuild',
git='https://github.com/intelxed/mbuild.git', git='https://github.com/intelxed/mbuild.git',
commit=mbuild_hash, destination='', commit=mbuild_hash, placement='mbuild',
when='@{0}'.format(vers)) when='@{0}'.format(vers))
variant('debug', default=False, description='Enable debug symbols') variant('debug', default=False, description='Enable debug symbols')
@ -65,7 +65,7 @@ def install(self, spec, prefix):
python_path = os.getenv('PYTHONPATH', '') python_path = os.getenv('PYTHONPATH', '')
os.environ['PYTHONPATH'] = mbuild_dir + ':' + python_path os.environ['PYTHONPATH'] = mbuild_dir + ':' + python_path
mfile = Executable('./mfile.py') mfile = Executable(join_path('.', 'mfile.py'))
args = ['-j', str(make_jobs), args = ['-j', str(make_jobs),
'--cc=%s' % spack_cc, '--cc=%s' % spack_cc,