hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Corrected Go dependent build environment. (#18493)

Browse source 
* Dependencies of Go will now correctly set the GOPATH for the
  appropriate spec to avoid using the user's default path.
* Bumped version to latest releases(1.15.6 & 1.14.13).
This commit is contained in:
Paul 2020-12-21 18:47:53 -07:00 committed by GitHub
parent a9925036df
commit 32f0bf9057
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
var/spack/repos/builtin/packages/go/package.py
View file

@ -38,10 +38,12 @@ class Go(Package):
extendable = True extendable = True
executables = ['^go$'] executables = ['^go$']
version('1.15.6', sha256='890bba73c5e2b19ffb1180e385ea225059eb008eb91b694875dd86ea48675817')
version('1.15.5', sha256='c1076b90cf94b73ebed62a81d802cd84d43d02dea8c07abdc922c57a071c84f1') version('1.15.5', sha256='c1076b90cf94b73ebed62a81d802cd84d43d02dea8c07abdc922c57a071c84f1')
version('1.15.2', sha256='28bf9d0bcde251011caae230a4a05d917b172ea203f2a62f2c2f9533589d4b4d') version('1.15.2', sha256='28bf9d0bcde251011caae230a4a05d917b172ea203f2a62f2c2f9533589d4b4d')
version('1.15.1', sha256='d3743752a421881b5cc007c76b4b68becc3ad053e61275567edab1c99e154d30') version('1.15.1', sha256='d3743752a421881b5cc007c76b4b68becc3ad053e61275567edab1c99e154d30')
version('1.15', sha256='69438f7ed4f532154ffaf878f3dfd83747e7a00b70b3556eddabf7aaee28ac3a') version('1.15', sha256='69438f7ed4f532154ffaf878f3dfd83747e7a00b70b3556eddabf7aaee28ac3a')
version('1.14.13', sha256='ba1d244c6b5c0ed04aa0d7856d06aceb89ed31b895de6ff783efb1cc8ab6b177')
version('1.14.12', sha256='b34f4b7ad799eab4c1a52bdef253602ce957125a512f5a1b28dce43c6841b971') version('1.14.12', sha256='b34f4b7ad799eab4c1a52bdef253602ce957125a512f5a1b28dce43c6841b971')
version('1.14.9', sha256='c687c848cc09bcabf2b5e534c3fc4259abebbfc9014dd05a1a2dc6106f404554') version('1.14.9', sha256='c687c848cc09bcabf2b5e534c3fc4259abebbfc9014dd05a1a2dc6106f404554')
version('1.14.8', sha256='d9a613fb55f508cf84e753456a7c6a113c8265839d5b7fe060da335c93d6e36a') version('1.14.8', sha256='d9a613fb55f508cf84e753456a7c6a113c8265839d5b7fe060da335c93d6e36a')
@ -173,19 +175,18 @@ def generate_path_components(self, dependent_spec):
tty.warn('GOROOT is set, this is not recommended') tty.warn('GOROOT is set, this is not recommended')
# Set to include paths of dependencies # Set to include paths of dependencies
path_components = [] path_components = [dependent_spec.prefix]
for d in dependent_spec.traverse(): for d in dependent_spec.traverse():
if d.package.extends(self.spec): if d.package.extends(self.spec):
path_components.append(d.prefix) path_components.append(d.prefix)
return path_components return ':'.join(path_components)
def setup_dependent_build_environment(self, env, dependent_spec): def setup_dependent_build_environment(self, env, dependent_spec):
# This *MUST* be first, this is where new code is installed # This *MUST* be first, this is where new code is installed
env.set('GOPATH', ':'.join(self.generate_path_components( env.prepend_path('GOPATH', self.generate_path_components(
dependent_spec))) dependent_spec))
def setup_dependent_run_environment(self, env, dependent_spec): def setup_dependent_run_environment(self, env, dependent_spec):
# Allow packages to find this when using module files # Allow packages to find this when using module files
env.prepend_path('GOPATH', ':'.join( env.prepend_path('GOPATH', self.generate_path_components(
[dependent_spec.prefix] + self.generate_path_components( dependent_spec))
dependent_spec)))