summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam J. Stewart <ajstewart426@gmail.com>2017-05-15 14:17:28 -0500
committerGitHub <noreply@github.com>2017-05-15 14:17:28 -0500
commit9f6c166f2fe5f9318da6a423666b9d857a47fa86 (patch)
tree2b099f5eb95bd608993071be1cd720019690a2df
parent6a328892d2c07505923a51c6a50c11ad639a9182 (diff)
downloadspack-9f6c166f2fe5f9318da6a423666b9d857a47fa86.tar.gz
spack-9f6c166f2fe5f9318da6a423666b9d857a47fa86.tar.bz2
spack-9f6c166f2fe5f9318da6a423666b9d857a47fa86.tar.xz
spack-9f6c166f2fe5f9318da6a423666b9d857a47fa86.zip
Add missing dependency to glib package (#4253)
-rw-r--r--var/spack/repos/builtin/packages/glib/package.py14
1 files changed, 14 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/glib/package.py b/var/spack/repos/builtin/packages/glib/package.py
index 6814d9270b..83099fa150 100644
--- a/var/spack/repos/builtin/packages/glib/package.py
+++ b/var/spack/repos/builtin/packages/glib/package.py
@@ -40,11 +40,14 @@ class Glib(AutotoolsPackage):
version('2.48.1', '67bd3b75c9f6d5587b457dc01cdcd5bb')
version('2.42.1', '89c4119e50e767d3532158605ee9121a')
+ variant('libmount', default=False, description='Build with libmount support')
+
depends_on('pkg-config@0.16:+internal_glib', type='build')
depends_on('libffi')
depends_on('zlib')
depends_on('gettext')
depends_on('pcre+utf', when='@2.48:')
+ depends_on('util-linux', when='+libmount')
# The following patch is needed for gcc-6.1
patch('g_date_strftime.patch', when='@2.42.1')
@@ -56,3 +59,14 @@ class Glib(AutotoolsPackage):
"""Handle glib's version-based custom URLs."""
url = 'http://ftp.gnome.org/pub/gnome/sources/glib'
return url + '/%s/glib-%s.tar.xz' % (version.up_to(2), version)
+
+ def configure_args(self):
+ spec = self.spec
+ args = []
+
+ if '+libmount' in spec:
+ args.append('--enable-libmount')
+ else:
+ args.append('--disable-libmount')
+
+ return args