diff options
| author | Richarda Butler <39577672+RikkiButler20@users.noreply.github.com> | 2021-02-07 03:52:07 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-07 12:52:07 +0100 |
| commit | 5f75221522c91107796cdee285ffd9e179fb23d4 (patch) | |
| tree | 1461c6f08edb68408778e8a7fa9cc806d255292b | |
| parent | 6e29a36d880cbf03125815d8b99fc8c414e21e9f (diff) | |
| download | spack-5f75221522c91107796cdee285ffd9e179fb23d4.tar.gz spack-5f75221522c91107796cdee285ffd9e179fb23d4.tar.bz2 spack-5f75221522c91107796cdee285ffd9e179fb23d4.tar.xz spack-5f75221522c91107796cdee285ffd9e179fb23d4.zip | |
Bugfix: Install font-util (#20179)
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
Co-authored-by: Greg Becker <becker33@llnl.gov>
| -rw-r--r-- | var/spack/repos/builtin/packages/font-util/package.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/font-util/package.py b/var/spack/repos/builtin/packages/font-util/package.py index bd7e41511a..b614a056ee 100644 --- a/var/spack/repos/builtin/packages/font-util/package.py +++ b/var/spack/repos/builtin/packages/font-util/package.py @@ -26,6 +26,7 @@ class FontUtil(AutotoolsPackage, XorgPackage): depends_on('mkfontdir', type='build') font_baseurl = 'https://www.x.org/archive/individual/font/' + default_fonts = [] fonts = [] # name, version, sha256 fonts_resource = [ @@ -70,12 +71,19 @@ class FontUtil(AutotoolsPackage, XorgPackage): f = f_r[0] resource(name=f, url=font_baseurl + f + '-' + f_r[1] + '.tar.gz', sha256=f_r[2], destination=f, when='fonts=' + f) + + conflicts('fonts=font-bh-ttf', when='platform=cray') + conflicts('fonts=font-bh-ttf', when='arch=linux-rhel7-broadwell') + + if f != 'font-bh-tff': + default_fonts.append(f) + fonts.append(f) variant('fonts', description='Installs fonts', values=fonts, - default=','.join(fonts), + default=','.join(default_fonts), multi=True) def setup_build_environment(self, env): |