diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2016-07-13 15:51:55 -0500 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2016-08-01 13:35:21 -0500 |
| commit | 1e3a5d4e26a8da593dcb5334673c4541ab31baa7 (patch) | |
| tree | 1975f16790a5758cad5d95e6ea4cdf59211e6184 | |
| parent | 6db99a4fe707e935127e98b0d85fa2f783f0ab45 (diff) | |
| download | spack-1e3a5d4e26a8da593dcb5334673c4541ab31baa7.tar.gz spack-1e3a5d4e26a8da593dcb5334673c4541ab31baa7.tar.bz2 spack-1e3a5d4e26a8da593dcb5334673c4541ab31baa7.tar.xz spack-1e3a5d4e26a8da593dcb5334673c4541ab31baa7.zip | |
Final fixes to get guile to build
| -rw-r--r-- | var/spack/repos/builtin/packages/gettext/package.py | 8 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/guile/package.py | 3 |
2 files changed, 0 insertions, 11 deletions
diff --git a/var/spack/repos/builtin/packages/gettext/package.py b/var/spack/repos/builtin/packages/gettext/package.py index 8583ae4b5e..0a0b163a74 100644 --- a/var/spack/repos/builtin/packages/gettext/package.py +++ b/var/spack/repos/builtin/packages/gettext/package.py @@ -34,7 +34,6 @@ class Gettext(Package): version('0.19.7', 'f81e50556da41b44c1d59ac93474dca5') # Recommended variants - variant('libiconv', default=True, description='Use libiconv') variant('curses', default=True, description='Use libncurses') variant('libxml2', default=True, description='Use libxml2') variant('git', default=True, description='Enable git support') @@ -46,7 +45,6 @@ class Gettext(Package): variant('libunistring', default=False, description='Use libunistring') # Recommended dependencies - depends_on('libiconv', when='+libiconv') depends_on('ncurses', when='+curses') depends_on('libxml2', when='+libxml2') # Java runtime and compiler (e.g. GNU gcj or kaffe) @@ -76,12 +74,6 @@ class Gettext(Package): '--without-cvs' ] - if '+libiconv' in spec: - config_args.append('--with-libiconv-prefix={0}'.format( - spec['libiconv'].prefix)) - else: - config_args.append('--without-libiconv-prefix') - if '+curses' in spec: config_args.append('--with-ncurses-prefix={0}'.format( spec['ncurses'].prefix)) diff --git a/var/spack/repos/builtin/packages/guile/package.py b/var/spack/repos/builtin/packages/guile/package.py index 03bdca440a..936ad154bd 100644 --- a/var/spack/repos/builtin/packages/guile/package.py +++ b/var/spack/repos/builtin/packages/guile/package.py @@ -37,7 +37,6 @@ class Guile(Package): variant('readline', default=True, description='Use the readline library') depends_on('gmp@4.2:') - depends_on('libiconv') depends_on('gettext') depends_on('libtool@1.5.6:') depends_on('libunistring@0.9.3:') @@ -49,7 +48,6 @@ class Guile(Package): def install(self, spec, prefix): config_args = [ '--prefix={0}'.format(prefix), - '--with-libiconv-prefix={0}'.format(spec['libiconv'].prefix), '--with-libunistring-prefix={0}'.format( spec['libunistring'].prefix), '--with-libltdl-prefix={0}'.format(spec['libtool'].prefix), @@ -68,4 +66,3 @@ class Guile(Package): make() make('check') make('install') - make('installcheck') |