diff options
author | bryanherman <63422190+bryanherman@users.noreply.github.com> | 2021-01-20 21:52:22 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-20 15:52:22 -0600 |
commit | a6ea16ded53bb688113012114a25b7d75e6460c0 (patch) | |
tree | 2899568445717ea45e848ebd75905557e749bd69 /var | |
parent | 966f6bc2d2a59c6623d72d2969c4f463b2bc927c (diff) | |
download | spack-a6ea16ded53bb688113012114a25b7d75e6460c0.tar.gz spack-a6ea16ded53bb688113012114a25b7d75e6460c0.tar.bz2 spack-a6ea16ded53bb688113012114a25b7d75e6460c0.tar.xz spack-a6ea16ded53bb688113012114a25b7d75e6460c0.zip |
Fix PVM dependencies (#20951)
* added m4 dep to PVM recipe
* added libtirpc dep to PVM recipe
* decode str or bytestr string to unicode
* Resolved comments from @adamjstewart on setup_build_environment
Diffstat (limited to 'var')
-rw-r--r-- | var/spack/repos/builtin/packages/pvm/package.py | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/pvm/package.py b/var/spack/repos/builtin/packages/pvm/package.py index ca3720020f..661cc70edb 100644 --- a/var/spack/repos/builtin/packages/pvm/package.py +++ b/var/spack/repos/builtin/packages/pvm/package.py @@ -17,19 +17,30 @@ class Pvm(MakefilePackage): version('3.4.6', sha256='482665e9bc975d826bcdacf1df1d42e43deda9585a2c430fd3b7b7ed08eada44') + depends_on('m4', type='build') + depends_on('libtirpc', type='link') + parallel = False @property def pvm_arch(self): """Returns the appropriate PVM_ARCH.""" process = subprocess.Popen(['lib/pvmgetarch'], stdout=subprocess.PIPE) - return process.communicate()[0].strip() + return process.communicate()[0].strip().decode() def edit(self, spec, prefix): # Before building PVM, you must set the environment # variable "PVM_ROOT" to the path where PVM resides env['PVM_ROOT'] = self.stage.source_path + def setup_build_environment(self, env): + tirpc = self.spec['libtirpc'].prefix + env.prepend_path( + 'SPACK_INCLUDE_DIRS', + tirpc.include.tirpc, + ) + env.set('SPACK_LDLIBS', '-ltirpc') + def install(self, spec, prefix): pvm_arch = self.pvm_arch |