depend on gettext in subversion when +nls is enabled (#30573)

This commit is contained in:
Danny McClanahan 2022-05-10 10:58:35 -04:00 committed by GitHub
parent 555202833f
commit dd7822fdf7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -17,6 +17,8 @@ class Subversion(AutotoolsPackage):
'https://downloads.apache.org/subversion/subversion-1.13.0.tar.gz' 'https://downloads.apache.org/subversion/subversion-1.13.0.tar.gz'
] ]
maintainers = ['cosmicexplorer']
tags = ['build-tools'] tags = ['build-tools']
version('1.14.1', sha256='dee2796abaa1f5351e6cc2a60b1917beb8238af548b20d3e1ec22760ab2f0cad') version('1.14.1', sha256='dee2796abaa1f5351e6cc2a60b1917beb8238af548b20d3e1ec22760ab2f0cad')
@ -32,6 +34,7 @@ class Subversion(AutotoolsPackage):
variant('serf', default=True, description='Serf HTTP client library') variant('serf', default=True, description='Serf HTTP client library')
variant('perl', default=False, description='Build with Perl bindings') variant('perl', default=False, description='Build with Perl bindings')
variant('nls', default=True, description='Enable Native Language Support')
depends_on('apr') depends_on('apr')
depends_on('apr-util') depends_on('apr-util')
@ -41,6 +44,7 @@ class Subversion(AutotoolsPackage):
depends_on('lz4', when='@1.10:') depends_on('lz4', when='@1.10:')
depends_on('utf8proc', when='@1.10:') depends_on('utf8proc', when='@1.10:')
depends_on('serf', when='+serf') depends_on('serf', when='+serf')
depends_on('gettext', when='+nls')
extends('perl', when='+perl') extends('perl', when='+perl')
depends_on('swig@1.3.24:3.0.0', when='+perl') depends_on('swig@1.3.24:3.0.0', when='+perl')
@ -91,6 +95,18 @@ def configure_args(self):
if '+perl' in spec: if '+perl' in spec:
args.append('PERL={0}'.format(spec['perl'].command.path)) args.append('PERL={0}'.format(spec['perl'].command.path))
if '+nls' in spec:
args.extend([
'LDFLAGS={0}'.format(spec['gettext'].libs.search_flags),
# Using .libs.link_flags is the canonical way to add these arguments,
# but since libintl is much smaller than the rest and also the only
# necessary one, we specify it by hand here.
'LIBS=-lintl',
'--enable-nls',
])
else:
args.append('--disable-nls')
return args return args
def build(self, spec, prefix): def build(self, spec, prefix):