From bcd8564f5c9b7954eca9d425fe90b174ea821ab9 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 23 Jan 2020 19:32:08 +0100 Subject: [PATCH] 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 --- recipes-python/pyqt5/python-pyqt5_5.13.2.bb | 2 +- recipes-qt/qt5/qtwebengine_git.bb | 2 +- recipes-qt/qt5/qtwebkit_git.bb | 2 +- 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 690757b..b8b1d08 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 @@ require python-pyqt5.inc -inherit python3native python3-dir +inherit pythonnative python-dir DEPENDS += "sip sip-native python" diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 30b283c..e42cf49 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -79,7 +79,7 @@ COMPATIBLE_MACHINE_aarch64 = "(.*)" inherit qmake5 inherit gettext -inherit python3native +inherit pythonnative inherit perlnative inherit features_check diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 5c3247d..6cc789f 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -18,7 +18,7 @@ SRC_URI += "\ file://0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch \ " -inherit cmake_qt5 perlnative python3native +inherit cmake_qt5 perlnative pythonnative # qemuarm build fails with: # | {standard input}: Assembler messages: