summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/glib/package.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/glib/package.py b/var/spack/repos/builtin/packages/glib/package.py
index c4838f77e0..f4b0bb8b1c 100644
--- a/var/spack/repos/builtin/packages/glib/package.py
+++ b/var/spack/repos/builtin/packages/glib/package.py
@@ -32,7 +32,6 @@ class Glib(AutotoolsPackage):
version('2.48.1', '67bd3b75c9f6d5587b457dc01cdcd5bb')
version('2.42.1', '89c4119e50e767d3532158605ee9121a')
- variant('iconv', default=False, description='Build with iconv support')
variant('libmount', default=False, description='Build with libmount support')
variant(
'tracing',
@@ -50,7 +49,7 @@ class Glib(AutotoolsPackage):
depends_on('python', type=('build', 'run'), when='@2.53.4:')
depends_on('pcre+utf', when='@2.48:')
depends_on('util-linux', when='+libmount')
- depends_on('libiconv', when='+iconv')
+ depends_on('libiconv')
# The following patch is needed for gcc-6.1
patch('g_date_strftime.patch', when='@2.42.1')
@@ -74,10 +73,7 @@ class Glib(AutotoolsPackage):
args.append('--with-python={0}'.format(
os.path.basename(self.spec['python'].command.path))
)
- if self.spec.satisfies('+iconv'):
- args.append('--with-libiconv=gnu')
- else:
- args.append('--with-libiconv=no')
+ args.append('--with-libiconv=gnu')
args.extend(self.enable_or_disable('tracing'))
# SELinux is not available in Spack, so glib should not use it.
args.append('--disable-selinux')