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

fenics, llvm: Fix package names being overriden (#11879)

Browse Source 
Setting name within the package class allows overriding the package
name, which both packages do using several for loops.

Fixes #11789
This commit is contained in:
Michael Kuhn 2019-06-28 15:59:19 +02:00 committed by Massimiliano Culpo
parent d6ecc29e4b
commit d2de78ab00
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
var/spack/repos/builtin/packages/fenics/package.py
View File

@ -117,13 +117,13 @@ class Fenics(CMakePackage):
for release in releases: for release in releases:
version(release['version'], release['md5'], url=base_url.format( version(release['version'], release['md5'], url=base_url.format(
pkg='dolfin', version=release['version'])) pkg='dolfin', version=release['version']))
for name, md5 in release['resources'].items(): for rname, md5 in release['resources'].items():
resource(name=name, resource(name=rname,
url=base_url.format(pkg=name, **release), url=base_url.format(pkg=rname, **release),
md5=md5, md5=md5,
destination='depends', destination='depends',
when='@{version}'.format(**release), when='@{version}'.format(**release),
placement=name) placement=rname)
def cmake_is_on(self, option): def cmake_is_on(self, option):
return 'ON' if option in self.spec else 'OFF' return 'ON' if option in self.spec else 'OFF'

34
var/spack/repos/builtin/packages/llvm/package.py
View File

@ -525,32 +525,32 @@ class Llvm(CMakePackage):
if release['version'] == 'develop': if release['version'] == 'develop':
version(release['version'], svn=release['repo']) version(release['version'], svn=release['repo'])
for name, repo in release['resources'].items(): for rname, repo in release['resources'].items():
resource(name=name, resource(name=rname,
svn=repo, svn=repo,
destination=resources[name]['destination'], destination=resources[rname]['destination'],
when='@%s%s' % (release['version'], when='@%s%s' % (release['version'],
resources[name].get('variant', "")), resources[rname].get('variant', "")),
placement=resources[name].get('placement', None)) placement=resources[rname].get('placement', None))
else: else:
version(release['version'], release['md5'], url=llvm_url % release) version(release['version'], release['md5'], url=llvm_url % release)
for name, md5 in release['resources'].items(): for rname, md5 in release['resources'].items():
resource(name=name, resource(name=rname,
url=resources[name]['url'] % release, url=resources[rname]['url'] % release,
md5=md5, md5=md5,
destination=resources[name]['destination'], destination=resources[rname]['destination'],
when='@%s%s' % (release['version'], when='@%s%s' % (release['version'],
resources[name].get('variant', "")), resources[rname].get('variant', "")),
placement=resources[name].get('placement', None)) placement=resources[rname].get('placement', None))
for release in flang_releases: for release in flang_releases:
if release['version'] == 'develop': if release['version'] == 'develop':
version('flang-' + release['version'], git=flang_llvm_url, branch=release['branch']) version('flang-' + release['version'], git=flang_llvm_url, branch=release['branch'])
for name, branch in release['resources'].items(): for rname, branch in release['resources'].items():
flang_resource = flang_resources[name] flang_resource = flang_resources[rname]
resource(name=name, resource(name=rname,
git=flang_resource['git'], git=flang_resource['git'],
branch=branch, branch=branch,
destination=flang_resource['destination'], destination=flang_resource['destination'],
@ -560,9 +560,9 @@ class Llvm(CMakePackage):
else: else:
version('flang-' + release['version'], git=flang_llvm_url, commit=release['commit']) version('flang-' + release['version'], git=flang_llvm_url, commit=release['commit'])
for name, commit in release['resources'].items(): for rname, commit in release['resources'].items():
flang_resource = flang_resources[name] flang_resource = flang_resources[rname]
resource(name=name, resource(name=rname,
git=flang_resource['git'], git=flang_resource['git'],
commit=commit, commit=commit,
destination=flang_resource['destination'], destination=flang_resource['destination'],