From 08799eac2316c2065f0e67f2d82a966877ca8035 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Fri, 24 Mar 2017 15:20:52 -0500 Subject: Add latest version of GNU Guile (#3541) --- var/spack/repos/builtin/packages/guile/package.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/guile/package.py b/var/spack/repos/builtin/packages/guile/package.py index 15e24e5634..90847a0088 100644 --- a/var/spack/repos/builtin/packages/guile/package.py +++ b/var/spack/repos/builtin/packages/guile/package.py @@ -25,13 +25,15 @@ from spack import * -class Guile(Package): +class Guile(AutotoolsPackage): """Guile is the GNU Ubiquitous Intelligent Language for Extensions, the official extension language for the GNU operating system.""" homepage = "https://www.gnu.org/software/guile/" - url = "https://ftp.gnu.org/gnu/guile/guile-2.0.11.tar.gz" + url = "https://ftp.gnu.org/gnu/guile/guile-2.2.0.tar.gz" + version('2.2.0', '0d5de8075b965f9ee5ea04399b60a3f9') + version('2.0.14', '333b6eec83e779935a45c818f712484e') version('2.0.11', 'e532c68c6f17822561e3001136635ddd') variant('readline', default=True, description='Use the readline library') @@ -45,9 +47,12 @@ class Guile(Package): depends_on('readline', when='+readline') depends_on('pkg-config', type='build') - def install(self, spec, prefix): + build_directory = 'spack-build' + + def configure_args(self): + spec = self.spec + config_args = [ - '--prefix={0}'.format(prefix), '--with-libunistring-prefix={0}'.format( spec['libunistring'].prefix), '--with-libltdl-prefix={0}'.format(spec['libtool'].prefix), @@ -61,8 +66,4 @@ class Guile(Package): else: config_args.append('--without-libreadline-prefix') - configure(*config_args) - - make() - make('check') - make('install') + return config_args -- cgit v1.2.3-60-g2f50