From 27e4a4750dcdabb55e23b4600ef63204c4ea1006 Mon Sep 17 00:00:00 2001 From: iarspider Date: Sat, 28 Mar 2020 15:10:31 +0100 Subject: Hack to select iconv implementation - libiconv vs. libc iconv (#15437) (re-do of #15213 due to changes in gnupg recipe) --- etc/spack/defaults/packages.yaml | 1 + var/spack/repos/builtin/packages/apr-util/package.py | 4 ++-- var/spack/repos/builtin/packages/bash/package.py | 4 ++-- var/spack/repos/builtin/packages/dcmtk/package.py | 2 +- var/spack/repos/builtin/packages/diffutils/package.py | 2 +- var/spack/repos/builtin/packages/doxygen/package.py | 4 +++- var/spack/repos/builtin/packages/gcc/package.py | 4 ++-- var/spack/repos/builtin/packages/gdal/package.py | 4 ++-- var/spack/repos/builtin/packages/git/package.py | 4 ++-- var/spack/repos/builtin/packages/glib/package.py | 7 +++++-- var/spack/repos/builtin/packages/gnupg/package.py | 4 ++-- var/spack/repos/builtin/packages/gnuplot/package.py | 2 +- var/spack/repos/builtin/packages/grass/package.py | 5 ++++- .../repos/builtin/packages/gtksourceview/package.py | 2 +- var/spack/repos/builtin/packages/lftp/package.py | 4 ++-- var/spack/repos/builtin/packages/libc/package.py | 19 +++++++++++++++++++ var/spack/repos/builtin/packages/libgd/package.py | 2 +- var/spack/repos/builtin/packages/libiconv/package.py | 1 + .../repos/builtin/packages/libspatialite/package.py | 2 +- .../repos/builtin/packages/libunistring/package.py | 2 +- var/spack/repos/builtin/packages/libxml2/package.py | 4 ++-- var/spack/repos/builtin/packages/libxslt/package.py | 2 +- var/spack/repos/builtin/packages/mono/package.py | 4 ++-- var/spack/repos/builtin/packages/ncl/package.py | 4 ++-- var/spack/repos/builtin/packages/poppler/package.py | 2 +- var/spack/repos/builtin/packages/procps/package.py | 4 ++-- var/spack/repos/builtin/packages/tar/package.py | 4 ++-- var/spack/repos/builtin/packages/unixodbc/package.py | 2 +- var/spack/repos/builtin/packages/wget/package.py | 2 +- var/spack/repos/builtin/packages/xerces-c/package.py | 4 ++-- 30 files changed, 70 insertions(+), 41 deletions(-) create mode 100644 var/spack/repos/builtin/packages/libc/package.py diff --git a/etc/spack/defaults/packages.yaml b/etc/spack/defaults/packages.yaml index 46aa5ad9ad..2c91b75e45 100644 --- a/etc/spack/defaults/packages.yaml +++ b/etc/spack/defaults/packages.yaml @@ -27,6 +27,7 @@ packages: glx: [mesa+glx, opengl] glu: [mesa-glu, openglu] golang: [gcc] + iconv: [libiconv] ipp: [intel-ipp] java: [openjdk, jdk, ibm-java] jpeg: [libjpeg-turbo, libjpeg] diff --git a/var/spack/repos/builtin/packages/apr-util/package.py b/var/spack/repos/builtin/packages/apr-util/package.py index 2d9354e817..0bb2fecfa6 100644 --- a/var/spack/repos/builtin/packages/apr-util/package.py +++ b/var/spack/repos/builtin/packages/apr-util/package.py @@ -24,7 +24,7 @@ class AprUtil(AutotoolsPackage): depends_on('apr') depends_on('expat') - depends_on('libiconv') + depends_on('iconv') depends_on('openssl', when='+crypto') depends_on('gdbm', when='+gdbm') @@ -38,7 +38,7 @@ class AprUtil(AutotoolsPackage): args = [ '--with-apr={0}'.format(spec['apr'].prefix), '--with-expat={0}'.format(spec['expat'].prefix), - '--with-iconv={0}'.format(spec['libiconv'].prefix), + '--with-iconv={0}'.format(spec['iconv'].prefix), # TODO: Add support for the following database managers '--without-ndbm', '--without-berkeley-db', diff --git a/var/spack/repos/builtin/packages/bash/package.py b/var/spack/repos/builtin/packages/bash/package.py index f6c7da8129..f690129424 100644 --- a/var/spack/repos/builtin/packages/bash/package.py +++ b/var/spack/repos/builtin/packages/bash/package.py @@ -19,7 +19,7 @@ class Bash(AutotoolsPackage, GNUMirrorPackage): depends_on('ncurses') depends_on('readline@5.0:') - depends_on('libiconv') + depends_on('iconv') patches = [ ('5.0', '001', 'f2fe9e1f0faddf14ab9bfa88d450a75e5d028fedafad23b88716bd657c737289'), @@ -54,7 +54,7 @@ class Bash(AutotoolsPackage, GNUMirrorPackage): '--with-curses', '--enable-readline', '--with-installed-readline', - '--with-libiconv-prefix={0}'.format(spec['libiconv'].prefix), + '--with-libiconv-prefix={0}'.format(spec['iconv'].prefix), ] def check(self): diff --git a/var/spack/repos/builtin/packages/dcmtk/package.py b/var/spack/repos/builtin/packages/dcmtk/package.py index de7a4c6ef2..2bf3db66d1 100644 --- a/var/spack/repos/builtin/packages/dcmtk/package.py +++ b/var/spack/repos/builtin/packages/dcmtk/package.py @@ -32,7 +32,7 @@ class Dcmtk(CMakePackage): depends_on('libxml2', type=('build', 'link'), when='+xml') variant('iconv', default=True, description="Charset conversion support (iconv)") - depends_on('libiconv', type=('build', 'link')) + depends_on('iconv', type=('build', 'link')) variant('cxx11', default=False, description="Enable c++11 features") variant('stl', default=True, description="Use native STL implementation") diff --git a/var/spack/repos/builtin/packages/diffutils/package.py b/var/spack/repos/builtin/packages/diffutils/package.py index c8f2dca83f..d41086113a 100644 --- a/var/spack/repos/builtin/packages/diffutils/package.py +++ b/var/spack/repos/builtin/packages/diffutils/package.py @@ -18,7 +18,7 @@ class Diffutils(AutotoolsPackage, GNUMirrorPackage): build_directory = 'spack-build' - depends_on('libiconv') + depends_on('iconv') def setup_build_environment(self, env): if self.spec.satisfies('%fj'): diff --git a/var/spack/repos/builtin/packages/doxygen/package.py b/var/spack/repos/builtin/packages/doxygen/package.py index aa99ca73ee..c3c80614d5 100644 --- a/var/spack/repos/builtin/packages/doxygen/package.py +++ b/var/spack/repos/builtin/packages/doxygen/package.py @@ -29,7 +29,7 @@ class Doxygen(CMakePackage): depends_on("cmake@2.8.12:", type='build') depends_on("python", type='build') # 2 or 3 OK; used in CMake build - depends_on("libiconv") + depends_on("iconv") depends_on("flex", type='build') # code.l just checks subminor version <=2.5.4 or >=2.5.33 # but does not recognize 2.6.x as newer...could be patched if needed @@ -45,6 +45,8 @@ class Doxygen(CMakePackage): patch('shared_ptr.patch', when='@1.8.14') def patch(self): + if self.spec['iconv'].name == 'libc': + return # On Linux systems, iconv is provided by libc. Since CMake finds the # symbol in libc, it does not look for libiconv, which leads to linker # errors. This makes sure that CMake always looks for the external diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py index f3891161a2..b7a08f8538 100644 --- a/var/spack/repos/builtin/packages/gcc/package.py +++ b/var/spack/repos/builtin/packages/gcc/package.py @@ -103,7 +103,7 @@ class Gcc(AutotoolsPackage, GNUMirrorPackage): depends_on('isl@0.15:0.18', when='@6:8.9') depends_on('isl@0.15:0.20', when='@9:') depends_on('zlib', when='@6:') - depends_on('libiconv', when='platform=darwin') + depends_on('iconv', when='platform=darwin') depends_on('gnat', when='languages=ada') depends_on('binutils~libiberty', when='+binutils') depends_on('zip', type='build', when='languages=java') @@ -356,7 +356,7 @@ class Gcc(AutotoolsPackage, GNUMirrorPackage): options.extend([ '--with-native-system-header-dir=/usr/include', '--with-sysroot={0}'.format(macos_sdk_path()), - '--with-libiconv-prefix={0}'.format(spec['libiconv'].prefix) + '--with-libiconv-prefix={0}'.format(spec['iconv'].prefix) ]) return options diff --git a/var/spack/repos/builtin/packages/gdal/package.py b/var/spack/repos/builtin/packages/gdal/package.py index 2182811233..b6b78f8020 100644 --- a/var/spack/repos/builtin/packages/gdal/package.py +++ b/var/spack/repos/builtin/packages/gdal/package.py @@ -107,7 +107,7 @@ class Gdal(AutotoolsPackage): # Optional dependencies depends_on('libtool', type='build', when='+libtool') depends_on('zlib', when='+libz') - depends_on('libiconv', when='+libiconv') + depends_on('iconv', when='+libiconv') depends_on('xz', when='+liblzma') depends_on('zstd', when='+zstd @2.3:') depends_on('postgresql', when='+pg') @@ -250,7 +250,7 @@ class Gdal(AutotoolsPackage): if '+libiconv' in spec: args.append('--with-libiconv-prefix={0}'.format( - spec['libiconv'].prefix)) + spec['iconv'].prefix)) else: args.append('--with-libiconv-prefix=no') diff --git a/var/spack/repos/builtin/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py index 1bd236051a..ba842587e2 100644 --- a/var/spack/repos/builtin/packages/git/package.py +++ b/var/spack/repos/builtin/packages/git/package.py @@ -177,7 +177,7 @@ class Git(AutotoolsPackage): depends_on('curl') depends_on('expat') depends_on('gettext') - depends_on('libiconv') + depends_on('iconv') depends_on('libidn2') depends_on('openssl') depends_on('pcre', when='@:2.13') @@ -221,7 +221,7 @@ class Git(AutotoolsPackage): configure_args = [ '--with-curl={0}'.format(spec['curl'].prefix), '--with-expat={0}'.format(spec['expat'].prefix), - '--with-iconv={0}'.format(spec['libiconv'].prefix), + '--with-iconv={0}'.format(spec['iconv'].prefix), '--with-openssl={0}'.format(spec['openssl'].prefix), '--with-perl={0}'.format(spec['perl'].command.path), '--with-zlib={0}'.format(spec['zlib'].prefix), 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') diff --git a/var/spack/repos/builtin/packages/gnupg/package.py b/var/spack/repos/builtin/packages/gnupg/package.py index 943f14d31f..d97aa10569 100644 --- a/var/spack/repos/builtin/packages/gnupg/package.py +++ b/var/spack/repos/builtin/packages/gnupg/package.py @@ -25,7 +25,7 @@ class Gnupg(AutotoolsPackage): depends_on('libassuan@2.4:', when='@:2.2.3') depends_on('libassuan@2.5:', when='@2.2.15:') depends_on('pinentry', type='run') - depends_on('libiconv') + depends_on('iconv') depends_on('zlib') def configure_args(self): @@ -42,7 +42,7 @@ class Gnupg(AutotoolsPackage): '--with-libassuan-prefix=' + self.spec['libassuan'].prefix, '--with-ksba-prefix=' + self.spec['libksba'].prefix, '--with-npth-prefix=' + self.spec['npth'].prefix, - '--with-libiconv-prefix=' + self.spec['libiconv'].prefix, + '--with-libiconv-prefix=' + self.spec['iconv'].prefix, '--with-zlib=' + self.spec['zlib'].prefix, '--without-tar', '--without-libiconv-prefix', diff --git a/var/spack/repos/builtin/packages/gnuplot/package.py b/var/spack/repos/builtin/packages/gnuplot/package.py index 17ee973eee..9fb79e6746 100644 --- a/var/spack/repos/builtin/packages/gnuplot/package.py +++ b/var/spack/repos/builtin/packages/gnuplot/package.py @@ -55,7 +55,7 @@ class Gnuplot(AutotoolsPackage): depends_on('readline') depends_on('pkgconfig', type='build') depends_on('libxpm') - depends_on('libiconv') + depends_on('iconv') # optional dependencies: depends_on('libcerf', when='+libcerf') diff --git a/var/spack/repos/builtin/packages/grass/package.py b/var/spack/repos/builtin/packages/grass/package.py index c80255fb43..cb83a5cc2a 100644 --- a/var/spack/repos/builtin/packages/grass/package.py +++ b/var/spack/repos/builtin/packages/grass/package.py @@ -58,7 +58,7 @@ class Grass(AutotoolsPackage): # http://htmlpreview.github.io/?https://github.com/OSGeo/grass/blob/master/REQUIREMENTS.html # General requirements depends_on('gmake@3.81:', type='build') - depends_on('libiconv') + depends_on('iconv') depends_on('zlib') depends_on('flex', type='build') depends_on('bison', type='build') @@ -254,5 +254,8 @@ class Grass(AutotoolsPackage): # hence invoke the following function afterwards @run_after('configure') def fix_iconv_linking(self): + if self.spec['iconv'].name != 'libiconv': + return + makefile = FileFilter('include/Make/Platform.make') makefile.filter(r'^ICONVLIB\s*=.*', 'ICONVLIB = -liconv') diff --git a/var/spack/repos/builtin/packages/gtksourceview/package.py b/var/spack/repos/builtin/packages/gtksourceview/package.py index 01876610b2..ed6737133a 100644 --- a/var/spack/repos/builtin/packages/gtksourceview/package.py +++ b/var/spack/repos/builtin/packages/gtksourceview/package.py @@ -35,7 +35,7 @@ class Gtksourceview(AutotoolsPackage): depends_on('pango') depends_on('gdk-pixbuf') depends_on('atk') - depends_on('libiconv') + depends_on('iconv') def url_for_version(self, version): url = 'https://download.gnome.org/sources/gtksourceview/' diff --git a/var/spack/repos/builtin/packages/lftp/package.py b/var/spack/repos/builtin/packages/lftp/package.py index 508dbdd586..b67b79bd5b 100644 --- a/var/spack/repos/builtin/packages/lftp/package.py +++ b/var/spack/repos/builtin/packages/lftp/package.py @@ -18,7 +18,7 @@ class Lftp(AutotoolsPackage): version('4.6.4', sha256='791e783779d3d6b519d0c23155430b9785f2854023eb834c716f5ba78873b15a') depends_on('expat') - depends_on('libiconv') + depends_on('iconv') depends_on('ncurses') depends_on('openssl') depends_on('readline') @@ -27,7 +27,7 @@ class Lftp(AutotoolsPackage): def configure_args(self): return [ '--with-expat={0}'.format(self.spec['expat'].prefix), - '--with-libiconv={0}'.format(self.spec['libiconv'].prefix), + '--with-libiconv={0}'.format(self.spec['iconv'].prefix), '--with-openssl={0}'.format(self.spec['openssl'].prefix), '--with-readline={0}'.format(self.spec['readline'].prefix), '--with-zlib={0}'.format(self.spec['zlib'].prefix), diff --git a/var/spack/repos/builtin/packages/libc/package.py b/var/spack/repos/builtin/packages/libc/package.py new file mode 100644 index 0000000000..a4fa9ac3a6 --- /dev/null +++ b/var/spack/repos/builtin/packages/libc/package.py @@ -0,0 +1,19 @@ +# Copyright 2013-2020 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * + + +class Libc(Package): + """Dummy libc package to provide `iconv` virtual package""" + + homepage = "https://en.wikipedia.org/wiki/C_standard_library" + url = "" + has_code = False + phases = [] + + version('1.0') # Dummy + variant('iconv', default=False, description='Set to True if libc provides iconv') + provides('iconv', when='+iconv') diff --git a/var/spack/repos/builtin/packages/libgd/package.py b/var/spack/repos/builtin/packages/libgd/package.py index 232b826bbf..d4907ae3e1 100644 --- a/var/spack/repos/builtin/packages/libgd/package.py +++ b/var/spack/repos/builtin/packages/libgd/package.py @@ -31,7 +31,7 @@ class Libgd(AutotoolsPackage): depends_on('gettext', type='build') depends_on('pkgconfig', type='build') - depends_on('libiconv') + depends_on('iconv') depends_on('libpng') depends_on('jpeg') depends_on('libtiff') diff --git a/var/spack/repos/builtin/packages/libiconv/package.py b/var/spack/repos/builtin/packages/libiconv/package.py index 642ad289fd..9331dfb399 100644 --- a/var/spack/repos/builtin/packages/libiconv/package.py +++ b/var/spack/repos/builtin/packages/libiconv/package.py @@ -20,6 +20,7 @@ class Libiconv(AutotoolsPackage, GNUMirrorPackage): # We cannot set up a warning for gets(), since gets() is not part # of C11 any more and thus might not exist. patch('gets.patch', when='@1.14') + provides('iconv') conflicts('@1.14', when='%gcc@5:') diff --git a/var/spack/repos/builtin/packages/libspatialite/package.py b/var/spack/repos/builtin/packages/libspatialite/package.py index e725fdfe0f..45fe1f6109 100644 --- a/var/spack/repos/builtin/packages/libspatialite/package.py +++ b/var/spack/repos/builtin/packages/libspatialite/package.py @@ -21,5 +21,5 @@ class Libspatialite(AutotoolsPackage): depends_on('proj@:5') depends_on('geos') depends_on('freexl') - depends_on('libiconv') + depends_on('iconv') depends_on('libxml2') diff --git a/var/spack/repos/builtin/packages/libunistring/package.py b/var/spack/repos/builtin/packages/libunistring/package.py index 94b1c24b98..9812fb32cb 100644 --- a/var/spack/repos/builtin/packages/libunistring/package.py +++ b/var/spack/repos/builtin/packages/libunistring/package.py @@ -19,7 +19,7 @@ class Libunistring(AutotoolsPackage, GNUMirrorPackage): version('0.9.7', sha256='2e3764512aaf2ce598af5a38818c0ea23dedf1ff5460070d1b6cee5c3336e797') version('0.9.6', sha256='2df42eae46743e3f91201bf5c100041540a7704e8b9abfd57c972b2d544de41b') - depends_on('libiconv') + depends_on('iconv') # glibc 2.28+ removed libio.h and thus _IO_ftrylockfile patch('removed_libio.patch', when='@:0.9.9') diff --git a/var/spack/repos/builtin/packages/libxml2/package.py b/var/spack/repos/builtin/packages/libxml2/package.py index 8c91852ae3..8c024854ea 100644 --- a/var/spack/repos/builtin/packages/libxml2/package.py +++ b/var/spack/repos/builtin/packages/libxml2/package.py @@ -23,7 +23,7 @@ class Libxml2(AutotoolsPackage): variant('python', default=False, description='Enable Python support') depends_on('pkgconfig@0.9.0:', type='build') - depends_on('libiconv') + depends_on('iconv') depends_on('zlib') depends_on('xz') @@ -49,7 +49,7 @@ class Libxml2(AutotoolsPackage): spec = self.spec args = ['--with-lzma={0}'.format(spec['xz'].prefix), - '--with-iconv={0}'.format(spec['libiconv'].prefix)] + '--with-iconv={0}'.format(spec['iconv'].prefix)] if '+python' in spec: args.extend([ diff --git a/var/spack/repos/builtin/packages/libxslt/package.py b/var/spack/repos/builtin/packages/libxslt/package.py index 7cdb0e41b2..5da6272d83 100644 --- a/var/spack/repos/builtin/packages/libxslt/package.py +++ b/var/spack/repos/builtin/packages/libxslt/package.py @@ -26,7 +26,7 @@ class Libxslt(AutotoolsPackage): variant('python', default=False, description='Build Python bindings') depends_on('pkgconfig@0.9.0:', type='build') - depends_on('libiconv') + depends_on('iconv') depends_on('libxml2') depends_on('libxml2+python', when='+python') depends_on('xz') diff --git a/var/spack/repos/builtin/packages/mono/package.py b/var/spack/repos/builtin/packages/mono/package.py index 73464f0fb9..6a7a96300a 100644 --- a/var/spack/repos/builtin/packages/mono/package.py +++ b/var/spack/repos/builtin/packages/mono/package.py @@ -25,7 +25,7 @@ class Mono(AutotoolsPackage): # Spack's openssl interacts badly with mono's vendored # "boringssl", don't drag it in w/ cmake depends_on('cmake~openssl', type=('build')) - depends_on('libiconv') + depends_on('iconv') depends_on('perl', type=('build')) version('6.8.0.105', sha256='578799c44c3c86a9eb5daf6dec6c60a24341940fd376371956d4a46cf8612178', @@ -50,6 +50,6 @@ class Mono(AutotoolsPackage): def configure_args(self): args = [] - li = self.spec['libiconv'].prefix + li = self.spec['iconv'].prefix args.append('--with-libiconv-prefix={p}'.format(p=li)) return args diff --git a/var/spack/repos/builtin/packages/ncl/package.py b/var/spack/repos/builtin/packages/ncl/package.py index 0fa063c52c..e6e09faae1 100644 --- a/var/spack/repos/builtin/packages/ncl/package.py +++ b/var/spack/repos/builtin/packages/ncl/package.py @@ -48,7 +48,7 @@ class Ncl(Package): # Extra dependencies that may be missing from build system: depends_on('bison', type='build') depends_on('flex+lex') - depends_on('libiconv') + depends_on('iconv') depends_on('tcsh') # Also, the manual says that ncl requires zlib, but that comes as a @@ -57,7 +57,7 @@ class Ncl(Package): # The following dependencies are required, otherwise several components # fail to compile: depends_on('curl') - depends_on('libiconv') + depends_on('iconv') depends_on('libx11') depends_on('libxaw') depends_on('libxmu') diff --git a/var/spack/repos/builtin/packages/poppler/package.py b/var/spack/repos/builtin/packages/poppler/package.py index 8689f817e5..affb9e5359 100644 --- a/var/spack/repos/builtin/packages/poppler/package.py +++ b/var/spack/repos/builtin/packages/poppler/package.py @@ -49,7 +49,7 @@ class Poppler(CMakePackage): depends_on('qt@4.0:', when='+qt') depends_on('zlib', when='+zlib') depends_on('cairo@1.10.0:', when='+glib') - depends_on('libiconv', when='+iconv') + depends_on('iconv', when='+iconv') depends_on('jpeg', when='+jpeg') depends_on('libpng', when='+png') depends_on('libtiff', when='+tiff') diff --git a/var/spack/repos/builtin/packages/procps/package.py b/var/spack/repos/builtin/packages/procps/package.py index f8b4ed2633..e18d6206cf 100644 --- a/var/spack/repos/builtin/packages/procps/package.py +++ b/var/spack/repos/builtin/packages/procps/package.py @@ -23,7 +23,7 @@ class Procps(AutotoolsPackage): depends_on('m4', type='build') depends_on('pkgconfig@0.9.0:', type='build') depends_on('dejagnu', type='test') - depends_on('libiconv') + depends_on('iconv') depends_on('gettext') depends_on('ncurses') @@ -35,7 +35,7 @@ class Procps(AutotoolsPackage): def configure_args(self): return [ - '--with-libiconv-prefix={0}'.format(self.spec['libiconv'].prefix), + '--with-libiconv-prefix={0}'.format(self.spec['iconv'].prefix), '--with-libintl-prefix={0}'.format(self.spec['gettext'].prefix), '--with-ncurses', # Required to avoid libintl linking errors diff --git a/var/spack/repos/builtin/packages/tar/package.py b/var/spack/repos/builtin/packages/tar/package.py index de12fd2344..15c2e4bc0e 100644 --- a/var/spack/repos/builtin/packages/tar/package.py +++ b/var/spack/repos/builtin/packages/tar/package.py @@ -19,7 +19,7 @@ class Tar(AutotoolsPackage, GNUMirrorPackage): version('1.29', sha256='cae466e6e58c7292355e7080248f244db3a4cf755f33f4fa25ca7f9a7ed09af0') version('1.28', sha256='6a6b65bac00a127a508533c604d5bf1a3d40f82707d56f20cefd38a05e8237de') - depends_on('libiconv') + depends_on('iconv') patch('tar-pgi.patch', when='@1.29') patch('config-pgi.patch', when='@:1.29') @@ -29,5 +29,5 @@ class Tar(AutotoolsPackage, GNUMirrorPackage): def configure_args(self): return [ - '--with-libiconv-prefix={0}'.format(self.spec['libiconv'].prefix), + '--with-libiconv-prefix={0}'.format(self.spec['iconv'].prefix), ] diff --git a/var/spack/repos/builtin/packages/unixodbc/package.py b/var/spack/repos/builtin/packages/unixodbc/package.py index 2802f87aa5..b93e7eb166 100644 --- a/var/spack/repos/builtin/packages/unixodbc/package.py +++ b/var/spack/repos/builtin/packages/unixodbc/package.py @@ -16,5 +16,5 @@ class Unixodbc(AutotoolsPackage): version('2.3.4', sha256='2e1509a96bb18d248bf08ead0d74804957304ff7c6f8b2e5965309c632421e39') - depends_on('libiconv') + depends_on('iconv') depends_on('libtool') diff --git a/var/spack/repos/builtin/packages/wget/package.py b/var/spack/repos/builtin/packages/wget/package.py index 122b138d10..c9ef5e9dd8 100644 --- a/var/spack/repos/builtin/packages/wget/package.py +++ b/var/spack/repos/builtin/packages/wget/package.py @@ -43,7 +43,7 @@ class Wget(AutotoolsPackage, GNUMirrorPackage): depends_on('perl@5.12.0:', type='build') depends_on('pkgconfig', type='build') - depends_on('libiconv') + depends_on('iconv') depends_on('valgrind', type='test') diff --git a/var/spack/repos/builtin/packages/xerces-c/package.py b/var/spack/repos/builtin/packages/xerces-c/package.py index 05af3d1a5c..21caf00e83 100644 --- a/var/spack/repos/builtin/packages/xerces-c/package.py +++ b/var/spack/repos/builtin/packages/xerces-c/package.py @@ -45,7 +45,7 @@ class XercesC(AutotoolsPackage): multi=False, description='Use the specified transcoder') - depends_on('libiconv', type='link', when='transcoder=gnuiconv') + depends_on('iconv', type='link', when='transcoder=gnuiconv') depends_on('icu4c', type='link', when='transcoder=icu') # Pass flags to configure. This is necessary for CXXFLAGS or else @@ -61,7 +61,7 @@ class XercesC(AutotoolsPackage): # There is no --with-pkg for gnuiconv. if name == 'ldflags' and 'transcoder=gnuiconv' in spec: - flags.append(spec['libiconv'].libs.ld_flags) + flags.append(spec['iconv'].libs.ld_flags) return (None, None, flags) -- cgit v1.2.3-70-g09d2