summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Kuhn <suraia@ikkoku.de>2018-06-01 17:47:13 +0200
committerAdam J. Stewart <ajstewart426@gmail.com>2018-06-01 10:47:13 -0500
commitbda05830da3581b246cdcb64fa006d71a8ea01e7 (patch)
treededd6ec01f4b959856fdf7b39967c4ef526c10a0
parent287a43ce354e12f4bad0c772311aa4b109e6a0e5 (diff)
downloadspack-bda05830da3581b246cdcb64fa006d71a8ea01e7.tar.gz
spack-bda05830da3581b246cdcb64fa006d71a8ea01e7.tar.bz2
spack-bda05830da3581b246cdcb64fa006d71a8ea01e7.tar.xz
spack-bda05830da3581b246cdcb64fa006d71a8ea01e7.zip
gmake: fix build with glibc 2.27 (#8344)
Also add an nls variant for gettext support.
-rw-r--r--var/spack/repos/builtin/packages/gmake/package.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/gmake/package.py b/var/spack/repos/builtin/packages/gmake/package.py
index d7a944e3b6..a47d3a0fdc 100644
--- a/var/spack/repos/builtin/packages/gmake/package.py
+++ b/var/spack/repos/builtin/packages/gmake/package.py
@@ -36,11 +36,16 @@ class Gmake(AutotoolsPackage):
version('4.0', 'b5e558f981326d9ca1bfdb841640721a')
variant('guile', default=False, description='Support GNU Guile for embedded scripting')
+ variant('nls', default=True, description='Enable Native Language Support')
+ depends_on('gettext', when='+nls')
depends_on('guile', when='+guile')
build_directory = 'spack-build'
+ patch('https://src.fedoraproject.org/rpms/make/raw/519a7c5bcbead22e6ea2d2c2341d981ef9e25c0d/f/make-4.2.1-glob-fix-2.patch', level=1, sha256='fe5b60d091c33f169740df8cb718bf4259f84528b42435194ffe0dd5b79cd125', when='@4.2.1')
+ patch('https://src.fedoraproject.org/rpms/make/raw/519a7c5bcbead22e6ea2d2c2341d981ef9e25c0d/f/make-4.2.1-glob-fix-3.patch', level=1, sha256='ca60bd9c1a1b35bc0dc58b6a4a19d5c2651f7a94a4b22b2c5ea001a1ca7a8a7f', when='@:4.2.1')
+
def configure_args(self):
args = []
@@ -49,6 +54,11 @@ class Gmake(AutotoolsPackage):
else:
args.append('--without-guile')
+ if '+nls' in self.spec:
+ args.append('--enable-nls')
+ else:
+ args.append('--disable-nls')
+
return args
@run_after('install')