From 6db99a4fe707e935127e98b0d85fa2f783f0ab45 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 13 Jul 2016 14:36:35 -0500 Subject: [PATCH] Rename gc => bdw-gc, fix libunistring bug --- var/spack/repos/builtin/packages/{gc => bdw-gc}/package.py | 2 +- var/spack/repos/builtin/packages/guile/package.py | 2 +- var/spack/repos/builtin/packages/libunistring/package.py | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) rename var/spack/repos/builtin/packages/{gc => bdw-gc}/package.py (98%) diff --git a/var/spack/repos/builtin/packages/gc/package.py b/var/spack/repos/builtin/packages/bdw-gc/package.py similarity index 98% rename from var/spack/repos/builtin/packages/gc/package.py rename to var/spack/repos/builtin/packages/bdw-gc/package.py index f03f139410c..2c61c21b43c 100644 --- a/var/spack/repos/builtin/packages/gc/package.py +++ b/var/spack/repos/builtin/packages/bdw-gc/package.py @@ -25,7 +25,7 @@ from spack import * -class Gc(Package): +class BdwGc(Package): """The Boehm-Demers-Weiser conservative garbage collector is a garbage collecting replacement for C malloc or C++ new.""" diff --git a/var/spack/repos/builtin/packages/guile/package.py b/var/spack/repos/builtin/packages/guile/package.py index 4b5f2c57e2f..03bdca440ac 100644 --- a/var/spack/repos/builtin/packages/guile/package.py +++ b/var/spack/repos/builtin/packages/guile/package.py @@ -41,7 +41,7 @@ class Guile(Package): depends_on('gettext') depends_on('libtool@1.5.6:') depends_on('libunistring@0.9.3:') - depends_on('gc@7.0:') + depends_on('bdw-gc@7.0:') depends_on('libffi') depends_on('readline', when='+readline') depends_on('pkg-config') diff --git a/var/spack/repos/builtin/packages/libunistring/package.py b/var/spack/repos/builtin/packages/libunistring/package.py index 585590be551..5b8837e72b2 100644 --- a/var/spack/repos/builtin/packages/libunistring/package.py +++ b/var/spack/repos/builtin/packages/libunistring/package.py @@ -34,11 +34,9 @@ class Libunistring(Package): version('0.9.6', 'cb09c398020c27edac10ca590e9e9ef3') - depends_on('libiconv') - def install(self, spec, prefix): - configure('--prefix={0}'.format(prefix), - '--with-libiconv-prefix={0}'.format(spec['libiconv'].prefix)) + configure('--prefix={0}'.format(prefix)) make() + # make('check') # test-verify fails for me, contacted developers make('install')