summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2020-01-23 19:32:08 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2020-01-23 19:44:43 +0100
commitbcd8564f5c9b7954eca9d425fe90b174ea821ab9 (patch)
treed574365aa1eb9db24471ff86aabbd114653b90a1
parent47fb26deddabe331514d54a5884bb319839d7de8 (diff)
downloadmeta-qt5-bcd8564f5c9b7954eca9d425fe90b174ea821ab9.tar.gz
Revert "recipes: Use python3 during build"
This reverts commit 47fb26deddabe331514d54a5884bb319839d7de8. Neither of these actually builds with python3, it's good fix to start parsing the layer again, but better to just skip them when meta-python2 isn't available 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
-rw-r--r--recipes-python/pyqt5/python-pyqt5_5.13.2.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebkit_git.bb2
3 files changed, 3 insertions, 3 deletions
diff --git a/recipes-python/pyqt5/python-pyqt5_5.13.2.bb b/recipes-python/pyqt5/python-pyqt5_5.13.2.bb
index 690757be..b8b1d086 100644
--- a/recipes-python/pyqt5/python-pyqt5_5.13.2.bb
+++ b/recipes-python/pyqt5/python-pyqt5_5.13.2.bb
@@ -1,6 +1,6 @@
1require python-pyqt5.inc 1require python-pyqt5.inc
2 2
3inherit python3native python3-dir 3inherit pythonnative python-dir
4 4
5DEPENDS += "sip sip-native python" 5DEPENDS += "sip sip-native python"
6 6
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 30b283c3..e42cf491 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -79,7 +79,7 @@ COMPATIBLE_MACHINE_aarch64 = "(.*)"
79 79
80inherit qmake5 80inherit qmake5
81inherit gettext 81inherit gettext
82inherit python3native 82inherit pythonnative
83inherit perlnative 83inherit perlnative
84inherit features_check 84inherit features_check
85 85
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index 5c3247dc..6cc789f0 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -18,7 +18,7 @@ SRC_URI += "\
18 file://0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch \ 18 file://0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch \
19" 19"
20 20
21inherit cmake_qt5 perlnative python3native 21inherit cmake_qt5 perlnative pythonnative
22 22
23# qemuarm build fails with: 23# qemuarm build fails with:
24# | {standard input}: Assembler messages: 24# | {standard input}: Assembler messages: