diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2020-01-23 19:37:20 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2020-01-24 11:57:37 +0100 |
commit | a797f85c6fa0b89cb20ac0346cf0406cc85569ce (patch) | |
tree | 19cd49599b4af21faec6db522d150127548ad172 | |
parent | b1f4f1fdd06d388a62b463ea54e26f8e5a852ad4 (diff) | |
download | meta-qt5-a797f85c6fa0b89cb20ac0346cf0406cc85569ce.tar.gz |
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
qtwebengine with python3 shows in log.do_configure that it won't actually
build qtwebengine, but it doesn't fail. do_compile fails but with a bit
misleading error:
ERROR: qtwebengine-5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0 do_compile: oe_runmake failed
ERROR: qtwebengine-5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0 do_compile: Execution of '/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/temp/run.do_compile.16479' failed with exit code 1:
cd src/ && ( test -e Makefile || /home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot-native/usr/bin/qmake -o Makefile /home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/git/src/src.pro CONFIG+=force_debug_info QT_BUILD_PARTS-=examples QT_BUILD_PARTS-=tests 'QMAKE_CXX=x86_64-webos-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse --sysroot=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot' 'QMAKE_CC=x86_64-webos-linux-gcc -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse --sysroot=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot' 'QMAKE_LINK=x86_64-webos-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse --sysroot=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot' 'QMAKE_CFLAGS= -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0=/usr/src/debug/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0 -fdebug-prefix-map=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0=/usr/src/debug/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0 -fdebug-prefix-map=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot= -fdebug-prefix-map=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot-native= ' 'QMAKE_CXXFLAGS= -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0=/usr/src/debug/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0 -fdebug-prefix-map=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0=/usr/src/debug/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0 -fdebug-prefix-map=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot= -fdebug-prefix-map=/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot-native= -fvisibility-inlines-hidden' -after ) && make -f Makefile
make[1]: Entering directory '/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/build/src'
/bin/sh: 1: Syntax error: "(" unexpected
Makefile:295: recipe for target 'errorbuild' failed
make[1]: *** [errorbuild] Error 2
make[1]: Leaving directory '/home/jenkins/workspace/luneos-unstable/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/build/src'
Makefile:48: recipe for target 'sub-src-make_first' failed
make: *** [sub-src-make_first] Error 2
WARNING: exit code 1 from a shell command.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | recipes-python/pyqt5/python-pyqt5_5.13.2.bb | 7 | ||||
-rw-r--r-- | recipes-qt/qt-kiosk-browser/qt-kiosk-browser_git.bb | 4 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 9 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebkit_git.bb | 9 |
4 files changed, 26 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 b8b1d086..e051b156 100644 --- a/recipes-python/pyqt5/python-pyqt5_5.13.2.bb +++ b/recipes-python/pyqt5/python-pyqt5_5.13.2.bb | |||
@@ -1,6 +1,11 @@ | |||
1 | require python-pyqt5.inc | 1 | require python-pyqt5.inc |
2 | 2 | ||
3 | inherit pythonnative python-dir | 3 | inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "pythonnative python-dir", "", d)} |
4 | |||
5 | python() { | ||
6 | if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): | ||
7 | raise bb.parse.SkipRecipe('Requires meta-python2 to be present.') | ||
8 | } | ||
4 | 9 | ||
5 | DEPENDS += "sip sip-native python" | 10 | DEPENDS += "sip sip-native python" |
6 | 11 | ||
diff --git a/recipes-qt/qt-kiosk-browser/qt-kiosk-browser_git.bb b/recipes-qt/qt-kiosk-browser/qt-kiosk-browser_git.bb index 44bdf18c..8ae0e9ef 100644 --- a/recipes-qt/qt-kiosk-browser/qt-kiosk-browser_git.bb +++ b/recipes-qt/qt-kiosk-browser/qt-kiosk-browser_git.bb | |||
@@ -4,6 +4,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464" | |||
4 | LICENSE = "GPLv3" | 4 | LICENSE = "GPLv3" |
5 | 5 | ||
6 | DEPENDS = "qtwebengine" | 6 | DEPENDS = "qtwebengine" |
7 | python() { | ||
8 | if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): | ||
9 | raise bb.parse.SkipRecipe('qtwebengine dependency requires meta-python2 to be present.') | ||
10 | } | ||
7 | 11 | ||
8 | SRC_URI = " \ | 12 | SRC_URI = " \ |
9 | git://github.com/OSSystems/qt-kiosk-browser;protocol=https \ | 13 | git://github.com/OSSystems/qt-kiosk-browser;protocol=https \ |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index e42cf491..c00120b3 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -79,10 +79,17 @@ COMPATIBLE_MACHINE_aarch64 = "(.*)" | |||
79 | 79 | ||
80 | inherit qmake5 | 80 | inherit qmake5 |
81 | inherit gettext | 81 | inherit gettext |
82 | inherit pythonnative | ||
83 | inherit perlnative | 82 | inherit perlnative |
84 | inherit features_check | 83 | inherit features_check |
85 | 84 | ||
85 | inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "pythonnative", "", d)} | ||
86 | |||
87 | python() { | ||
88 | if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): | ||
89 | raise bb.parse.SkipRecipe('Requires meta-python2 to be present.') | ||
90 | } | ||
91 | |||
92 | |||
86 | # Static builds of QtWebEngine aren't supported. | 93 | # Static builds of QtWebEngine aren't supported. |
87 | CONFLICT_DISTRO_FEATURES = "qt5-static" | 94 | CONFLICT_DISTRO_FEATURES = "qt5-static" |
88 | 95 | ||
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 6cc789f0..942e733a 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb | |||
@@ -18,7 +18,14 @@ 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 | ||
21 | inherit cmake_qt5 perlnative pythonnative | 21 | inherit cmake_qt5 perlnative |
22 | |||
23 | inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "pythonnative", "", d)} | ||
24 | |||
25 | python() { | ||
26 | if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): | ||
27 | raise bb.parse.SkipRecipe('Requires meta-python2 to be present.') | ||
28 | } | ||
22 | 29 | ||
23 | # qemuarm build fails with: | 30 | # qemuarm build fails with: |
24 | # | {standard input}: Assembler messages: | 31 | # | {standard input}: Assembler messages: |