From d2de78ab00ba5b72a2f3ee2a41d7a8b6f28bf7ca Mon Sep 17 00:00:00 2001
From: Michael Kuhn <michael.kuhn@informatik.uni-hamburg.de>
Date: Fri, 28 Jun 2019 15:59:19 +0200
Subject: [PATCH] fenics, llvm: Fix package names being overriden (#11879)
Setting name within the package class allows overriding the package
name, which both packages do using several for loops.
Fixes #11789
---
.../repos/builtin/packages/fenics/package.py | 8 ++---
.../repos/builtin/packages/llvm/package.py | 34 +++++++++----------
2 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/var/spack/repos/builtin/packages/fenics/package.py b/var/spack/repos/builtin/packages/fenics/package.py
index 63df7416a7..db6cd24bf8 100644
--- a/var/spack/repos/builtin/packages/fenics/package.py
+++ b/var/spack/repos/builtin/packages/fenics/package.py
@@ -117,13 +117,13 @@ class Fenics(CMakePackage):
for release in releases:
version(release['version'], release['md5'], url=base_url.format(
pkg='dolfin', version=release['version']))
- for name, md5 in release['resources'].items():
- resource(name=name,
- url=base_url.format(pkg=name, **release),
+ for rname, md5 in release['resources'].items():
+ resource(name=rname,
+ url=base_url.format(pkg=rname, **release),
md5=md5,
destination='depends',
when='@{version}'.format(**release),
- placement=name)
+ placement=rname)
def cmake_is_on(self, option):
return 'ON' if option in self.spec else 'OFF'
diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py
index 9984149a88..c19c623cc9 100644
--- a/var/spack/repos/builtin/packages/llvm/package.py
+++ b/var/spack/repos/builtin/packages/llvm/package.py
@@ -525,32 +525,32 @@ class Llvm(CMakePackage):
if release['version'] == 'develop':
version(release['version'], svn=release['repo'])
- for name, repo in release['resources'].items():
- resource(name=name,
+ for rname, repo in release['resources'].items():
+ resource(name=rname,
svn=repo,
- destination=resources[name]['destination'],
+ destination=resources[rname]['destination'],
when='@%s%s' % (release['version'],
- resources[name].get('variant', "")),
- placement=resources[name].get('placement', None))
+ resources[rname].get('variant', "")),
+ placement=resources[rname].get('placement', None))
else:
version(release['version'], release['md5'], url=llvm_url % release)
- for name, md5 in release['resources'].items():
- resource(name=name,
- url=resources[name]['url'] % release,
+ for rname, md5 in release['resources'].items():
+ resource(name=rname,
+ url=resources[rname]['url'] % release,
md5=md5,
- destination=resources[name]['destination'],
+ destination=resources[rname]['destination'],
when='@%s%s' % (release['version'],
- resources[name].get('variant', "")),
- placement=resources[name].get('placement', None))
+ resources[rname].get('variant', "")),
+ placement=resources[rname].get('placement', None))
for release in flang_releases:
if release['version'] == 'develop':
version('flang-' + release['version'], git=flang_llvm_url, branch=release['branch'])
- for name, branch in release['resources'].items():
- flang_resource = flang_resources[name]
- resource(name=name,
+ for rname, branch in release['resources'].items():
+ flang_resource = flang_resources[rname]
+ resource(name=rname,
git=flang_resource['git'],
branch=branch,
destination=flang_resource['destination'],
@@ -560,9 +560,9 @@ class Llvm(CMakePackage):
else:
version('flang-' + release['version'], git=flang_llvm_url, commit=release['commit'])
- for name, commit in release['resources'].items():
- flang_resource = flang_resources[name]
- resource(name=name,
+ for rname, commit in release['resources'].items():
+ flang_resource = flang_resources[rname]
+ resource(name=rname,
git=flang_resource['git'],
commit=commit,
destination=flang_resource['destination'],
--
GitLab