zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glib: fix 2.56 build with python@2 (#17144)

Browse Source 
* glib: fix 2.56 build with python@2

* flake8
This commit is contained in:
Seth R. Johnson
2020-06-18 00:32:25 -04:00
committed by GitHub
parent c8199ece65
commit 1bb94f2913
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
var/spack/repos/builtin/packages/glib/package.py
View File

@@ -141,10 +141,18 @@ def configure_args(self):
args.append('--with-libiconv=maybe') args.append('--with-libiconv=maybe')
else: else:
args.append('--with-libiconv=gnu') args.append('--with-libiconv=gnu')
if 'tracing=dtrace' in self.spec or 'tracing=systemtap' in self.spec: if self.spec.satisfies('@2.56:'):
args.append('--enable-tracing') for value in ('dtrace', 'systemtap'):
if ('tracing=' + value) in self.spec:
args.append('--enable-' + value)
else:
args.append('--disable-' + value)
else: else:
args.append('--disable-tracing') if ('tracing=dtrace' in self.spec
or 'tracing=systemtap' in self.spec):
args.append('--enable-tracing')
else:
args.append('--disable-tracing')
# SELinux is not available in Spack, so glib should not use it. # SELinux is not available in Spack, so glib should not use it.
args.append('--disable-selinux') args.append('--disable-selinux')
# glib should not use the globally installed gtk-doc. Otherwise, # glib should not use the globally installed gtk-doc. Otherwise,