From 2765861705d3f48e8504c2f0b3e26ade6f5a65dc Mon Sep 17 00:00:00 2001 From: Bernhard Kaindl <43588962+bernhardkaindl@users.noreply.github.com> Date: Wed, 17 Nov 2021 13:42:49 +0100 Subject: qt+webkit: Build needs Py2, but mesa/Meson needs Py3 (#27466) mesa inherits MesonPackage (since October 2020) which depends on Py@3. The conflicts('mesa') enables a regular build of `qt@5.7:5.15+webkit` without having to specify the exact version by causing the concretizer to select mesa18 which does not depend on python@3. Co-authored-by: Bernhard Kaindl --- var/spack/repos/builtin/packages/qt/package.py | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 324d29ad42..0073b1db56 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -193,10 +193,25 @@ class Qt(Package): depends_on("flex", type='build') depends_on("bison", type='build') depends_on("gperf") - depends_on("python@2.7.5:2", type='build') + + # qtwebengine@5.7:5.15 are based on Google Chromium versions which depend on Py2 + with when('@5.7:5.15'): + depends_on('python@2.7.5:2', type='build') + # mesa inherits MesonPackage (since October 2020) which depends on Py@3. + # The conflicts('mesa') enables a regular build of `qt@5.7:5.15+webkit` + # without having to specify the exact version by causing the concretizer + # to select mesa18 which does not depend on python@3. + conflicts('mesa') + + with when('@5.10:'): + depends_on('nss@3.62:') with when('@5.7:'): - depends_on("nss") + # https://www.linuxfromscratch.org/blfs/view/svn/x/qtwebengine.html + depends_on('ninja', type='build') + + # https://doc.qt.io/qt-5.15/qtwebengine-platform-notes.html + with when('@5.7: platform=linux'): depends_on("libdrm") depends_on("libxcomposite") depends_on("libxcursor") -- cgit v1.2.3-70-g09d2