Skip to content
Snippets Groups Projects
Unverified Commit 06a0fe9d authored by darmac's avatar darmac Committed by GitHub
Browse files

util-linux: remove libintl link (#18065)

parent bef02e9d
No related branches found
No related tags found
No related merge requests found
...@@ -24,22 +24,15 @@ class UtilLinux(AutotoolsPackage): ...@@ -24,22 +24,15 @@ class UtilLinux(AutotoolsPackage):
depends_on('python@2.7:') depends_on('python@2.7:')
depends_on('pkgconfig') depends_on('pkgconfig')
depends_on('gettext', when='+libmount')
# Make it possible to disable util-linux's libuuid so that you may # Make it possible to disable util-linux's libuuid so that you may
# reliably depend_on(`libuuid`). # reliably depend_on(`libuuid`).
variant('libuuid', default=True, description='Build libuuid') variant('libuuid', default=True, description='Build libuuid')
variant('libmount', default=False, description='Build libmount.so with gettext')
def url_for_version(self, version): def url_for_version(self, version):
url = "https://www.kernel.org/pub/linux/utils/util-linux/v{0}/util-linux-{1}.tar.gz" url = "https://www.kernel.org/pub/linux/utils/util-linux/v{0}/util-linux-{1}.tar.gz"
return url.format(version.up_to(2), version) return url.format(version.up_to(2), version)
def setup_build_environment(self, env):
if '+libmount' in self.spec:
env.append_flags('LDFLAGS', '-L{0} -lintl'.format(
self.spec['gettext'].prefix.lib))
def configure_args(self): def configure_args(self):
config_args = [ config_args = [
'--disable-use-tty-group', '--disable-use-tty-group',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment