* For now just skip version check. Looked into: ninja came from meta-oe to
oe-core with:
commit fc3aef67a95a90e9a485c6b0e93db8cdeab5d3ab
Author: Khem Raj <raj.khem@gmail.com>
Date: Thu Jul 27 21:52:12 2017 -0700
ninja: Add recipe
llvm is using it, therefore move it from meta-oe
Signed-off-by: Khem Raj <raj.khem@gmail.com>
That was in rocko release cycle. So the assumption we have a ninja decent
enough should be acceptable.
* and since the upgrade to ninja-1.10.0 in:
commit d1cd957cea29f3ab111ae752bc9ad75a1324c255
Author: Upgrade Helper <auh@auh.yoctoproject.org>
Date: Fri Feb 21 14:45:35 2020 -0800
ninja: upgrade 1.9.0 -> 1.10.0
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
the do_configure task fails with:
| ERROR: Feature 'webengine-system-ninja' was enabled, but the pre-condition 'tests.webengine-ninja' failed.
* Looked into qtwebengine current dev branch: There is no solution yet. So as
soon as upstream offers a better solution most likely this patch will not
apply any more and has to be removed then.
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
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=942720https://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>
This reverts commit 47fb26dedd.
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=942720https://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>
* fixes 0004-mkspecs-Allow-builds-with-libc-glibc.patch which didn't apply at all,
because the modified mkspecs/features/configure.prf was dropped completely in:
commit 047d61f188aae3fe3ebc689900b8a5c9fb6e901d
Author: Michal Klocek michal.klocek@qt.io
Date: Fri Aug 9 17:40:29 2019 +0200
Add webengine-core feature
The same chunk can be found in src/buildtools/config/support.pri, so I've updated
the .patch accordingly, but haven't tried the build with musl yet.
* fixes 0023-chromium-Move-CharAllocator-definition-to-a-header-f.patch to apply
ERROR: qtwebengine-5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0 do_patch: Command Error: 'quilt --quiltrc /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0 Output:
Applying patch 0023-chromium-Move-CharAllocator-definition-to-a-header-f.patch
patching file chromium/cc/base/list_container_helper.cc
Hunk #1 FAILED at 13.
1 out of 1 hunk FAILED -- rejects in file chromium/cc/base/list_container_helper.cc
patching file chromium/cc/base/list_container_helper.h
Hunk #1 FAILED at 8.
Hunk #2 succeeded at 174 with fuzz 1.
1 out of 2 hunks FAILED -- rejects in file chromium/cc/base/list_container_helper.h
Patch 0023-chromium-Move-CharAllocator-definition-to-a-header-f.patch does not apply (enforce with -f)
ERROR: Logfile of failure stored in: /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/temp/log.do_patch.21067
NOTE: recipe qtwebengine-5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0: task do_patch: Failed
ERROR: Task (/OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtwebengine_git.bb:do_patch) failed with exit code '1'
* build is still going (it will be a while on my slow builder)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This helps in getting full class definition, in other sources which are
operating on sizeof operator, clang10 finds it insufficient information
and errors out reporting that sizeof can not be applied on a forward
declared class. This patch fixes that
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Currently, musl build fails to generate .pc ( packageconfig ) files
because qmake has logic to detect glibc, which obviously will be failing
for musl, and as a result it does not generate all needed files which
then fails during do_install like below
| sed: can't read /mnt/b/yoe/build/tmp/work/core2-32-yoe-linux-musl/qtwebengine/5.13.2+gitAUTOINC+556576b55f_843d70ac87-r0/image/usr/lib/pkgconfig/Qt5WebEngineCore.pc: No such file or directory
Signed-off-by: Khem Raj <raj.khem@gmail.com>
* 4 musl patches didn't apply at all
* 0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch is
dropped, because whole chromium/device/serial/serial_io_handler_posix.cc
was removed in upgrade to 73:
commit 38a9a29f4f9436cace7f0e7abf9c586057df8a4e
Author: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Wed Feb 13 16:23:34 2019 +0100
Subject: BASELINE: Update Chromium to 73.0.3683.37
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Update recipes for Qt 5.13.0, add new recipes for Qt modules qtcoap
and qtlottie, and remove qtcanvas3d.
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
OE-Core sets -mcpu option, which is equivalent to -march and -mtune
combination. Therefore don't set -march and -mtune in chromium.
Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com>
* it was fixed in:
5be2654885
* but then when upgrading to 5.12.3 from meta-qt5/qtwebengine I've accidentally overwritten
this one with the older version in:
e2707a016c
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* be aware that in 3 qt* project the v5.12.3 tag wasn't created yet:
qtknx_git.bb:# v5.12.3 tag wasn't created yet
qtmqtt_git.bb:# v5.12.3 tag wasn't created yet
qtopcua_git.bb:# v5.12.3 tag wasn't created yet
* and qttools, qt3d, qtremoteobjects v5.12.3 tag isn't in 5.12 branch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Provide couple of patches to fix build with x86_64/musl and a new
bug found lss via gcc9
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* Remove override for PACKAGE_DEBUG_SPLIT_STYLE so that source code
for QtWebEngine is included in the debug package.
Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* WIP
* zlib temporarily disabled in qtbase-native, the configure fails too
find it even when it is in RSS:
docker-shr qemux86-64@ ~/build/oe-core $ find /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0 -name zlib\*
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/freetype/src/gzip/zlib.h
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib.pri
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib/src/zlib.h
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib_dependency.pri
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/usr/lib/pkgconfig/zlib.pc
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/usr/include/zlib.h
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/sysroot-providers/zlib-native
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/installeddeps/zlib-native
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/installeddeps/zlib-native.2dcdd26b684916aff89d13cb1c919939
/OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/installeddeps/zlib-native.complete
ERROR: Feature 'system-zlib' was enabled, but the pre-condition 'libs.zlib' failed.
* fixes#136
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* drop nobranch=1 again
* update the branches and tags on meta-qt5/qt* forks and the tag name
in recipes
* use latest revision in 5.11 branch instead of 5.11.2 which might be
removed again
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Update The-Qt-Company-Commercial license to the actual commercial
license which also replaces preview license in qtbase. Remove old
licenses that are no longer used in any module.
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Enable debug info for webengine builds. The mkspec needed fixing,
otherwise CFLAGS were fed incorrectly to Ninja.
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
The corresponding recipe in poky is named "glib-2.0_XXX.bb",
not "glib_XXX.bb" which causes parser errors when enabling
'glib' in PACKAGECONFIG.
Signed-off-by: Jens Rehsack <sno@netbsd.org>
