From 9caba3e0720064aff30525c322fa7a88ad6c6904 Mon Sep 17 00:00:00 2001 From: Rémi Lacroix Date: Fri, 26 Jul 2019 17:32:39 +0200 Subject: Small fixes for font-util package (#12148) * font-util: Remove duplicated dependencies. * font-util: Fix path handling for font resources. The "join_path" call made no sense but still managed to work somehow most of the times. --- var/spack/repos/builtin/packages/font-util/package.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/font-util/package.py b/var/spack/repos/builtin/packages/font-util/package.py index ce0e028335..b11719e2e0 100644 --- a/var/spack/repos/builtin/packages/font-util/package.py +++ b/var/spack/repos/builtin/packages/font-util/package.py @@ -23,9 +23,6 @@ class FontUtil(AutotoolsPackage): depends_on('mkfontscale', type='build') depends_on('mkfontdir', type='build') - depends_on('autoconf', type='build') - depends_on('automake', type='build') - font_baseurl = 'https://www.x.org/archive/individual/font/' fonts = [] # name, version, md5 @@ -104,7 +101,7 @@ class FontUtil(AutotoolsPackage): for font in fonts: fontroot = find(font, '*', recursive=False) - with working_dir(join_path(font, fontroot[0])): + with working_dir(fontroot[0]): autoreconf(*autoconf_args) configure = Executable("./configure") configure('--prefix={0}'.format(self.prefix)) -- cgit v1.2.3-70-g09d2