mirror of
http://code.qt.io/yocto/meta-qt6.git
synced 2026-01-01 13:58:07 +00:00
pyside6: support clang from oe-core
Clang recipes have been moved from meta-clang layer to oe-core in whinlatter. Add support for using pyside6 without meta-clang layer, but with the clang recipes from oe-core. Pick-to: 6.8 Change-Id: I62b74f34bbcbe37060117681034614168b43690d Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
This commit is contained in:
parent
44ef3480d3
commit
fb21821c4d
|
|
@ -55,5 +55,8 @@ QT_COMMERCIAL_GIT_PROTOCOL ?= "ssh"
|
|||
|
||||
QT_COMMERCIAL_MODULES ?= "0"
|
||||
|
||||
CAN_USE_PYSIDE6 = "${@True if 'clang-layer' in d.getVar('BBFILE_COLLECTIONS').split() or \
|
||||
os.path.exists(os.path.join(d.getVar('COREBASE'),'meta/recipes-devtools/clang')) else False}"
|
||||
|
||||
# License mapping back to old license files
|
||||
SPDXLICENSEMAP[GFDL-1.3-no-invariants-only] = "GFDL-1.3"
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = " \
|
|||
"
|
||||
|
||||
python() {
|
||||
if 'clang-layer' not in d.getVar('BBFILE_COLLECTIONS').split():
|
||||
raise bb.parse.SkipRecipe('Requires meta-clang to be present.')
|
||||
if not bb.utils.to_boolean(d.getVar('CAN_USE_PYSIDE6')):
|
||||
raise bb.parse.SkipRecipe('clang is not available.')
|
||||
}
|
||||
|
||||
inherit setuptools3
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ inherit packagegroup
|
|||
PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
|
||||
|
||||
RDEPENDS:${PN} += " \
|
||||
${@bb.utils.contains('BBFILE_COLLECTIONS', 'clang-layer', 'python3-pyside6', '', d)} \
|
||||
${@'python3-pyside6' if bb.utils.to_boolean(d.getVar('CAN_USE_PYSIDE6')) else ''} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d', '', d)} \
|
||||
qt5compat \
|
||||
qtapplicationmanager \
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user