This reverts commit fd946afc0a.
Fix was merged in qtbase.
Change-Id: I16c05ad1f681a8a92b83c2bad6aa69de8ab2e35f
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
execinfo is not part of main C library on musl, but we do have a package
providing that, therefore depend on it when using musl.
Change-Id: I99b1651b5a8096a3014be3588a84e21ddac1c761
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
oe-core as switched to nanbield.
Pick-to: 6.6 6.5
Change-Id: Iebc445cea81d1449f0564f036787c44ba6aa8a87
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
qsb needs spirv-tools when -O flag is given, but it is not pulled in
recipe-sysroot-native due to missing dependency. It causes qsb files
are not created as output. Errors like below can be seen with a small
tweak that makes qsb run with no -s flag.
[1/218] cd /home/noelma/work/webos/build-webos/BUILD/work/x86_64-linux/qtdeclarative-native/6.7.0-r0/build/src/quick && /home/noelma/work/webos/build-webos/BUILD/work/x86_64-linux/qtdeclarative-native/6.7.0-r0/recipe-sysroot-native/usr/bin/qsb --glsl 100es,120,150 --hlsl 50 --msl 12 -b -O -o /home/noelma/work/webos/build-webos/BUILD/work/x86_64-linux/qtdeclarative-native/6.7.0-r0/build/src/quick/.qsb/scenegraph/shaders_ng/8bittextmask.frag.qsb /home/noelma/work/webos/build-webos/BUILD/work/x86_64-linux/qtdeclarative-native/6.7.0-r0/git/src/quick/scenegraph/shaders_ng/8bittextmask.frag
spirv-opt -O /tmp/qsb-XOAphY/qsb_spv_temp -o /tmp/qsb-XOAphY/qsb_spv_temp_out
Failed to run spirv-opt -O /tmp/qsb-XOAphY/qsb_spv_temp -o /tmp/qsb-XOAphY/qsb_spv_temp_out: Child process set up failed: execve: No such file or directory
Pick-to: 6.6 6.5 6.2
Change-Id: I49c88711be4ca09425fa71f8ce8eda88256370f6
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
lcl_maybe_fortify might be empty, which would make sed fail during
do_install. Workaround this by adding space to the substitution
pattern.
Fixes: QTBUG-115588
Pick-to: 6.6 6.5 6.2
Change-Id: Ic6c5a6c80011dfefc92e1b2d7aadc48cce82ed7a
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
meta-qt6 is planned to be as much as possible a drop-in replacement
for meta-qt5 layer. All the Qt module recipes use the same names as
the ones in meta-qt5. This means that both meta-qt5 and meta-qt6
layers can not be used at the same and adding both Qt5 and Qt6 to
the same image is not possible.
This script does a brute force rename for all the module names to make
it possible to use both layers at the same time. The new module names
get '6' postfix e.g. qtbase6, qtdeclarative6, qtdeclarative6-native.
Since both Qt versions deploy files with same names, the install paths
for either meta-qt5 or meta-qt6 must be changed.
For meta-qt5:
QT_DIR_NAME = "/qt5"
For meta-qt6:
QT6_INSTALL_BINDIR:append = "/qt6"
QT6_INSTALL_DATADIR:append = "/qt6"
QT6_INSTALL_PLUGINSDIR:append = "/qt6"
QT6_INSTALL_QMLDIR:append = "/qt6"
QT6_INSTALL_TRANSLATIONSDIR:append = "/qt6"
EXTRANATIVEPATH:append = "/qt6"
configured in a suitable global configuration file.
Change-Id: I141e3b7a2d6c7df8795e67311e06e7a0465de91a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Examples now have dependency to QtSvg, include it if examples
are enabled.
Pick-to: 6.6
Change-Id: Ie049a282456f3647b280b788a3a589c74aeedeba
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Using int caused a compilation error with GCC 12.
Fixes: QTBUG-115981
Change-Id: I82107b143995ced6de0facb41e9964e42148d402
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 7d72d5053a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Now using 112 branch.
Change-Id: I193759ca61b6b09c23865a54cb6be3477e67e849
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit d40da8f6cb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
After 35cb20a3556a6987d31090cdc3f77126efceaab0 landed in
qtapplicationmanager we need to disable multi-process pkgconfig in static build to fix build issue:
"ERROR: Feature "am_multi_process": Forcing to "ON" breaks its condition"
Change-Id: Idd901baf72236db2a21c25d5b6a905c1246e0c6a
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit b2ae9232f6)
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Dunfell is no longer supported, remove unneeded bbappend.
Change-Id: I1249fd9cd6e2344216f225c2aa9e68b65834a9e6
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
The recipes were duplicated from meta-python in order to support
build with dunfell release. Since that is no longer supported,
we can remove the recipes.
Change-Id: I897bf06f62107c2a14a54fcff9f3be0ebcce7f99
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
sqlite3 is too old for the current code in qtbase.
Change-Id: I53d31b8d247590a45bf20971758be31f3404629e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Langdale is now EOL, stop testing Qt against it.
Pick-to: 6.6 6.5
Change-Id: Idba5e353ef3ec484e088fe831ed59f54d70b3acf
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Kirkstone will be the oldests Yocto release supported by Qt 6.7.
Qt 6.7 will be released in spring 2024, at which point Dunfell
will be EOL.
Change-Id: I8fee78d4d75401a502762e4b28987a07bfdd1af4
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Tommi Mänttäri <tommi.manttari@qt.io>
QEMU has QA warning on runtime dependencies which breaks
our CI build since they are treated as errors.
Pick-to: 6.6 6.5
Change-Id: I1f2699d62d556b538da85aa12d8c2ec91483fb0b
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Yocto has INIT_MANAGER variable that can be used to select
the init manager. Use it instead of doing all to separate
changes ourselves.
Pick-to: 6.6 6.5
Change-Id: I8aa31de9116048628a55d630ed3296fac28dfec8
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Add runtime dependency to spirv-tools as the qsb utility can use
spirv-opt at runtime. Cannot include it for mingw32 toolchain
as compilation fails.
To support dunfell, add BBCLASSEXTEND append to the spirv-tools.
Fixes: QTBUG-113210
Pick-to: 6.6 6.5 6.2
Change-Id: Icce264b1f2bff5f56cf2b40a0420c5001493e236
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
If examples are only using QML modules, the package manager won't
add automatic dependency to either the main or -qmlplugins packages,
and those might not get installed to the image. Add the runtime
dependency explicitly for the examples package.
Fixes: QTBUG-115310
Pick-to: 6.6 6.5 6.2
Change-Id: I5b713d3a65f794da1ab0113cf1d7f69035e29288
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
qtwebview has direct build dependency on qtwebengine and it can be tried
to build in world builds since it does not have same restrictions on
supported hosts as qtwenengine, therefore match it.
Change-Id: I018471bacc232349a5763822daf3131ae32f17c0
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
meta-qt6 plans to use conan have not materialized
Change-Id: I038dcf17729e4706f5319ddd3e0f33d4a5facc2d
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Update readme for the 6.6 branch compatibility and testing.
Pick-to: 6.6
Change-Id: Ib093cd11c3fe4c57c511f59fd0cf82f90969c15c
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
The layer configuration uses SPDXLICENSEMAP to change GPL-3.0-only to
GPL-3.0 (and other maps). Inluding meta-qt6 results in _all_
GPL-3.0-only licensed packages to be changed to GPL-3.0. As a result,
setting
INCOMPATIBLE_LICENSE += "GPL-3.0* LGPL-3.0* AGPL-3.0*"
does not filter out GPL-3.0-only packages anymore. This means
GPL-3.0-only packages still land in the target image. Adding GPL-3.0 to
the INCOMPATIBLE_LICENSE settings is not allowed, as Yocto has
deprecated these licenses.
This removes these license mappings so the incompatible license filter
is restored.
Change-Id: I5d1c13764bd034f5a20ea0cf3b6d98f1d29244d7
Pick-to: 6.6 6.5
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
QDoc depends on libclang and using clang toolchain causes build error:
| CMake Error at qttools/6.6.0-r0/recipe-sysroot/usr/lib/cmake/Qt6/QtToolHelpers.cmake:623 (message):
| Failed to find the host tool "Qt6::qdoc". It is part of the Qt6ToolsTools
| package, but the package did not contain the tool. Make sure that the host
| module Tools was built with all features enabled (no explicitly disabled
| tools).
because libclang was found for qttools-native, but not for the target.
Add PACKAGECONFIG that can be enabled when using clang toolchain
if there is need for the qdoc, but otherwise keep it disabled.
Pick-to: 6.6 6.5 6.2
Change-Id: Idc4e35936511ef0c208d7e8fd6f8fc51f3f8a1e2
Reviewed-by: Martin Jansa <Martin.Jansa@gmail.com>
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
Reviewed-by: Khem Raj <raj.khem@gmail.com>
Add PACKAGECONFIG options for gold and bfd linkers so that they can
be easily changed independently of the ld-is-gold DISTRO_FEATURE.
For CI builds, drop ld-is-gold feature and instead enable gold only
for Qt modules.
Pick-to: 6.5
Change-Id: I63e3835f15c732f57740b6718245e4f45ddb6c8c
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Qt expects to have UTF-8 locale available. If the current locale
is not UTF-8, Qt will try to use C.UTF-8 locale. Make that available
by adding RRECOMMENDS to locale-base-c package.
Task-number: QTBUG-113371
Pick-to: 6.5 6.2
Change-Id: I48f18488413168afbeffddb9eac58985d1b8a988
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
* fixes:
http://errors.yoctoproject.org/Errors/Details/704200/
qt3d/6.5.0-r0/git/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp:475:61: error: 'uint32_t' is not a member of 'std'; did you mean 'wint_t'?
475 | if (!is64bits && (length > std::numeric_limits<std::uint32_t>::max())) {
| ^~~~~~~~
| wint_t
Pick-to: 6.5
Change-Id: I503f18ae93a24fe08b66827b4ab2dc5b7562819a
Reviewed-by: Martin Jansa <Martin.Jansa@gmail.com>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Set up the BBFILES_DYNAMIC variable to include meta-python and move all
python recipes to the corresponding dynamic-layers directory. This
prevents failures to parse recipes if meta-python is not available.
Pick-to: 6.5
Fixes: QTBUG-113712
Change-Id: If26668e8d901c89be8527ff3951a00d739a89372
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
