From 1bb94f2913b8657ce098230f33a08be38e1ba05a Mon Sep 17 00:00:00 2001 From: "Seth R. Johnson" Date: Thu, 18 Jun 2020 00:32:25 -0400 Subject: glib: fix 2.56 build with python@2 (#17144) * glib: fix 2.56 build with python@2 * flake8 --- var/spack/repos/builtin/packages/glib/package.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/glib/package.py b/var/spack/repos/builtin/packages/glib/package.py index 4d648ddb3a..6426286b35 100644 --- a/var/spack/repos/builtin/packages/glib/package.py +++ b/var/spack/repos/builtin/packages/glib/package.py @@ -141,10 +141,18 @@ class Glib(Package): args.append('--with-libiconv=maybe') else: args.append('--with-libiconv=gnu') - if 'tracing=dtrace' in self.spec or 'tracing=systemtap' in self.spec: - args.append('--enable-tracing') + if self.spec.satisfies('@2.56:'): + for value in ('dtrace', 'systemtap'): + if ('tracing=' + value) in self.spec: + args.append('--enable-' + value) + else: + args.append('--disable-' + value) 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. args.append('--disable-selinux') # glib should not use the globally installed gtk-doc. Otherwise, -- cgit v1.2.3-70-g09d2