zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Final fixes to get guile to build

Browse Source
This commit is contained in:
Adam J. Stewart 2016-07-13 15:51:55 -05:00
parent 6db99a4fe7
commit 1e3a5d4e26
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
var/spack/repos/builtin/packages/gettext/package.py
View File

@ -34,7 +34,6 @@ class Gettext(Package):
version('0.19.7', 'f81e50556da41b44c1d59ac93474dca5') version('0.19.7', 'f81e50556da41b44c1d59ac93474dca5')
# Recommended variants # Recommended variants
variant('libiconv', default=True, description='Use libiconv')
variant('curses', default=True, description='Use libncurses') variant('curses', default=True, description='Use libncurses')
variant('libxml2', default=True, description='Use libxml2') variant('libxml2', default=True, description='Use libxml2')
variant('git', default=True, description='Enable git support') variant('git', default=True, description='Enable git support')
@ -46,7 +45,6 @@ class Gettext(Package):
variant('libunistring', default=False, description='Use libunistring') variant('libunistring', default=False, description='Use libunistring')
# Recommended dependencies # Recommended dependencies
depends_on('libiconv', when='+libiconv')
depends_on('ncurses', when='+curses') depends_on('ncurses', when='+curses')
depends_on('libxml2', when='+libxml2') depends_on('libxml2', when='+libxml2')
# Java runtime and compiler (e.g. GNU gcj or kaffe) # Java runtime and compiler (e.g. GNU gcj or kaffe)
@ -76,12 +74,6 @@ def install(self, spec, prefix):
'--without-cvs' '--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: if '+curses' in spec:
config_args.append('--with-ncurses-prefix={0}'.format( config_args.append('--with-ncurses-prefix={0}'.format(
spec['ncurses'].prefix)) spec['ncurses'].prefix))

3
var/spack/repos/builtin/packages/guile/package.py
View File

@ -37,7 +37,6 @@ class Guile(Package):
variant('readline', default=True, description='Use the readline library') variant('readline', default=True, description='Use the readline library')
depends_on('gmp@4.2:') depends_on('gmp@4.2:')
depends_on('libiconv')
depends_on('gettext') depends_on('gettext')
depends_on('libtool@1.5.6:') depends_on('libtool@1.5.6:')
depends_on('libunistring@0.9.3:') depends_on('libunistring@0.9.3:')
@ -49,7 +48,6 @@ class Guile(Package):
def install(self, spec, prefix): def install(self, spec, prefix):
config_args = [ config_args = [
'--prefix={0}'.format(prefix), '--prefix={0}'.format(prefix),
'--with-libiconv-prefix={0}'.format(spec['libiconv'].prefix),
'--with-libunistring-prefix={0}'.format( '--with-libunistring-prefix={0}'.format(
spec['libunistring'].prefix), spec['libunistring'].prefix),
'--with-libltdl-prefix={0}'.format(spec['libtool'].prefix), '--with-libltdl-prefix={0}'.format(spec['libtool'].prefix),
@ -68,4 +66,3 @@ def install(self, spec, prefix):
make() make()
make('check') make('check')
make('install') make('install')
make('installcheck')