mirror of
https://github.com/thead-yocto-mirror/meta-qt5
synced 2026-09-17 04:31:54 +02:00
python-pyqt5, qtwebengine, qtwebkit, qt-kiosk-browser: skip without meta-python2
Neither of these actually builds with python3, skip them when meta-python2 isn't included until real fix is available. qtwebkit might not get the support for python3 at all qtwebengine I have some changes for the initial build, but there are many more needed as shown in upstream chromium: https://bugs.chromium.org/p/chromium/issues/detail?id=942720 https://bugs.chromium.org/p/chromium/issues/list?q=label%3AProj-Python3Migration&can=2 python-pyqt5 is already blacklisted because of sip Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
@@ -1,6 +1,11 @@
|
||||
require python-pyqt5.inc
|
||||
|
||||
inherit pythonnative python-dir
|
||||
inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "pythonnative python-dir", "", d)}
|
||||
|
||||
python() {
|
||||
if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
|
||||
raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
|
||||
}
|
||||
|
||||
DEPENDS += "sip sip-native python"
|
||||
|
||||
|
||||
@@ -4,6 +4,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464"
|
||||
LICENSE = "GPLv3"
|
||||
|
||||
DEPENDS = "qtwebengine"
|
||||
python() {
|
||||
if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
|
||||
raise bb.parse.SkipRecipe('qtwebengine dependency requires meta-python2 to be present.')
|
||||
}
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/OSSystems/qt-kiosk-browser;protocol=https \
|
||||
|
||||
@@ -79,10 +79,17 @@ COMPATIBLE_MACHINE_aarch64 = "(.*)"
|
||||
|
||||
inherit qmake5
|
||||
inherit gettext
|
||||
inherit pythonnative
|
||||
inherit perlnative
|
||||
inherit features_check
|
||||
|
||||
inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "pythonnative", "", d)}
|
||||
|
||||
python() {
|
||||
if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
|
||||
raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
|
||||
}
|
||||
|
||||
|
||||
# Static builds of QtWebEngine aren't supported.
|
||||
CONFLICT_DISTRO_FEATURES = "qt5-static"
|
||||
|
||||
|
||||
@@ -18,7 +18,14 @@ SRC_URI += "\
|
||||
file://0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch \
|
||||
"
|
||||
|
||||
inherit cmake_qt5 perlnative pythonnative
|
||||
inherit cmake_qt5 perlnative
|
||||
|
||||
inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "pythonnative", "", d)}
|
||||
|
||||
python() {
|
||||
if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
|
||||
raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
|
||||
}
|
||||
|
||||
# qemuarm build fails with:
|
||||
# | {standard input}: Assembler messages:
|
||||
|
||||
Reference in New Issue
Block a user