diff options
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/libxml2/package.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/python/package.py | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/libxml2/package.py b/var/spack/repos/builtin/packages/libxml2/package.py index 6c7d08ab3e..8c91852ae3 100644 --- a/var/spack/repos/builtin/packages/libxml2/package.py +++ b/var/spack/repos/builtin/packages/libxml2/package.py @@ -27,7 +27,8 @@ class Libxml2(AutotoolsPackage): depends_on('zlib') depends_on('xz') - depends_on('python+shared', when='+python') + # avoid cycle dependency for concretizer + depends_on('python+shared~libxml2', when='+python') extends('python', when='+python', ignore=r'(bin.*$)|(include.*$)|(share.*$)|(lib/libxml2.*$)|' '(lib/xml2.*$)|(lib/cmake.*$)') diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index bdc4a64019..55dfcc9021 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -70,6 +70,10 @@ class Python(AutotoolsPackage): extendable = True + # Variants to avoid cyclical dependencies for concretizer + variant('libxml2', default=False, + description='Use a gettext library build with libxml2') + variant( 'debug', default=False, description="debug build with extra checks (this is high overhead)" @@ -116,7 +120,8 @@ class Python(AutotoolsPackage): variant('tix', default=False, description='Build Tix module') depends_on('pkgconfig@0.9.0:', type='build') - depends_on('gettext') + depends_on('gettext +libxml2', when='+libxml2') + depends_on('gettext ~libxml2', when='~libxml2') # Optional dependencies # See detect_modules() in setup.py for details |