diff options
| author | iarspider <iarspider@gmail.com> | 2020-03-28 15:10:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-28 09:10:31 -0500 |
| commit | 27e4a4750dcdabb55e23b4600ef63204c4ea1006 (patch) | |
| tree | 99d9d5d99fca9509d3f224e36f88974577b0d99c /var/spack/repos/builtin/packages/glib | |
| parent | 9f7255da71c3bac2ee55d9b172136c6752fe2f4f (diff) | |
| download | spack-27e4a4750dcdabb55e23b4600ef63204c4ea1006.tar.gz spack-27e4a4750dcdabb55e23b4600ef63204c4ea1006.tar.bz2 spack-27e4a4750dcdabb55e23b4600ef63204c4ea1006.tar.xz spack-27e4a4750dcdabb55e23b4600ef63204c4ea1006.zip | |
Hack to select iconv implementation - libiconv vs. libc iconv (#15437)
(re-do of #15213 due to changes in gnupg recipe)
Diffstat (limited to 'var/spack/repos/builtin/packages/glib')
| -rw-r--r-- | var/spack/repos/builtin/packages/glib/package.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/glib/package.py b/var/spack/repos/builtin/packages/glib/package.py index e43a9d1728..4319568008 100644 --- a/var/spack/repos/builtin/packages/glib/package.py +++ b/var/spack/repos/builtin/packages/glib/package.py @@ -46,7 +46,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') + depends_on('iconv') # The following patch is needed for gcc-6.1 patch('g_date_strftime.patch', when='@2.42.1') @@ -70,7 +70,10 @@ class Glib(AutotoolsPackage): args.append('--with-python={0}'.format( os.path.basename(self.spec['python'].command.path)) ) - args.append('--with-libiconv=gnu') + if 'libc' in self.spec: + args.append('--with-libiconv=maybe') + else: + 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') |