From a6ea16ded53bb688113012114a25b7d75e6460c0 Mon Sep 17 00:00:00 2001
From: bryanherman <63422190+bryanherman@users.noreply.github.com>
Date: Wed, 20 Jan 2021 21:52:22 +0000
Subject: [PATCH] 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
---
 var/spack/repos/builtin/packages/pvm/package.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

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