diff options
| -rw-r--r-- | var/spack/repos/builtin/packages/libxcb/package.py | 5 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/xcb-proto/package.py | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/libxcb/package.py b/var/spack/repos/builtin/packages/libxcb/package.py index 74fc410f45..129cfa7fdc 100644 --- a/var/spack/repos/builtin/packages/libxcb/package.py +++ b/var/spack/repos/builtin/packages/libxcb/package.py @@ -32,11 +32,8 @@ class Libxcb(AutotoolsPackage): depends_on("xcb-proto@1.12:", when="@1.12:1.12.999") depends_on("xcb-proto@1.11:", when="@1.11:1.11.999") - # TODO: uncomment once build deps can be resolved separately - # See #7646, #4145, #4063, and #2548 for details # libxcb 1.13 added Python 3 support - # depends_on('python', type='build') - # depends_on('python@2:2.8', when='@:1.12', type='build') + depends_on("python@3", when="@1.13:", type="build") depends_on("pkgconfig", type="build") depends_on("util-macros", type="build") diff --git a/var/spack/repos/builtin/packages/xcb-proto/package.py b/var/spack/repos/builtin/packages/xcb-proto/package.py index 525dfe6824..b60245ce07 100644 --- a/var/spack/repos/builtin/packages/xcb-proto/package.py +++ b/var/spack/repos/builtin/packages/xcb-proto/package.py @@ -20,9 +20,7 @@ class XcbProto(AutotoolsPackage): version("1.12", sha256="cfa49e65dd390233d560ce4476575e4b76e505a0e0bacdfb5ba6f8d0af53fd59") version("1.11", sha256="d12152193bd71aabbdbb97b029717ae6d5d0477ab239614e3d6193cc0385d906") - # TODO: uncomment once build deps can be resolved separately - # See #7646, #4145, #4063, and #2548 for details - # extends('python') + extends("python") patch("xcb-proto-1.12-schema-1.patch", when="@1.12") |