summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * qtbase: remove qtbase-native from DEPENDSMing Liu2017-08-131-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | qtbase-native has been included by QT5TOOLSDEPENDS, so this line is redundant and leading multiple qtbase-native existing in DEPENDS. Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| | * qt3d: Fix build with clangKhem Raj2017-08-102-0/+47
| | | | | | | | | | | | | | | Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| | * qtwebkit: Backport a patch to fix build with icu-59Khem Raj2017-08-102-0/+93
| | | | | | | | | | | | | | | | | | Signed-off-by: Khem Raj <raj.khem@gmail.com> Tested-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| | * quazip: update to 0.7.3 and add missing metadataJonathan Liu2017-08-082-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | The license checksum has changed as a static linking exception has been added on top of the LGPL 2.1 license. Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| | * qtbase: Use sched_yield instead of pthread_yieldKhem Raj2017-08-082-0/+64
| | | | | | | | | | | | | | | | | | | | | Makes it portable across glibc and musl Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| | * qtbase: Fix ptests with clangKhem Raj2017-08-082-0/+33
| | | | | | | | | | | | | | | Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| | * qt5-ptest: fix build with yocto < 2.3 (pyro)Luca Ceresoli2017-08-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The expand parameter to DataSmart.getVar() defaults to True since yocto 2.3 (pyro) [0]. Stable Yocto releases 2.2 (morty) and 2.1 (krogoth) had no default value. Older, now unsupported releases defaulted to False [1] [2]. Not passing the expand parameter here means all recipes including qt5-ptest.inc won't build with yocto 2.2 and 2.1 with this error message: $ bitbake qtxmlpatterns -vfc populate_sysroot [...] ERROR: Error executing a python function in exec_python_func() autogenerated: The stack trace of python calls that resulted in this exception/failure was: File: 'exec_python_func() autogenerated', lineno: 2, function: <module> 0001: *** 0002:do_populate_sysroot(d) 0003: File: '[...]/poky/meta/classes/staging.bbclass', lineno: 227, function: do_populate_sysroot 0223: p = p.replace("/", "_") 0224: with open(provdir + p, "w") as f: 0225: f.write(pn) 0226:} *** 0227: 0228:do_populate_sysroot[vardeps] += "${SYSROOT_PREPROCESS_FUNCS}" 0229:do_populate_sysroot[vardepsexclude] += "MULTI_PROVIDER_WHITELIST" 0230: 0231:SSTATETASKS += "do_populate_sysroot" Exception: TypeError: getVar() missing 1 required positional argument: 'expand' DEBUG: Python function do_populate_sysroot finished ERROR: Function failed: do_populate_sysroot Fixing this in a user layer requires duplicating the entire do_populate_sysroot_append() in the .bbappend of all packages including qt5-ptest.inc, i.e. currently qtdeclarative, qtquick1 and qtxmlpatterns. Avoid the hassle for those users by explicitly passing expand=True. [0] http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=2631c375b8a025ee2e4329f6d93900bb7b5dadf7 [1] http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=c7610aa353e31977c099ce574acb188a3f4219e0 [2] http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=4e5e501155a21fe64a470c626b3afe6d9748308e Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| | * qtbase: add ptestHuang Qiyu2017-08-083-1/+50
| | | | | | | | | | | | | | | | | | | | | Add ptest for qtbase by using provided testsuite. Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| | * qwt-qt5.inc: fix QA warningMartin Jansa2017-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | * it was partially fixed in previous change, but there was still: qwt-qt5-6.1.3: qwt-qt5-dbg: found library in wrong location: /usr/plugins/designer/.debug/libqwt_designer_plugin.so [libdir] Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| | * qt5-git.inc: set CVE_PRODUCT to qtMikko Rapeli2017-07-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | It is used in NVD for CVE's like: https://nvd.nist.gov/vuln/detail/CVE-2015-1860 Signed-off-by: Mikko Rapeli <mikko.rapeli@bmw.de> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| | * python-pyqt5: include QtWidgets moduleDiego Rondini2017-07-212-2/+38
| | | | | | | | | | | | | | | Signed-off-by: Diego Rondini <diego.rondini@kynetics.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| | * qt5-creator: Link with libexecinfo on muslKhem Raj2017-07-142-0/+24
| | | | | | | | | | | | | | | Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| | * qtvirtualkeyboard: Include sys/time.hKhem Raj2017-07-142-0/+29
| | | | | | | | | | | | | | | | | | | | | Fixes build on musl Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| | * qtwebengine: Fix build on muslKhem Raj2017-07-1415-1/+565
| | | | | | | | | | | | | | | | | | | | | import needed chromium patches from meta-browser Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| | * qt5-creator: Fix build with NO_ACCESSIBILITYKhem Raj2017-07-143-0/+81
| | | | | | | | | | | | | | | | | | | | | Also add missing headers in sources Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| | * maliit-framework-qt5: Always have optimize flagsKhem Raj2017-07-142-4/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building with hardening flags we need some optlevel > 0 enabled, otherwise FORTIFY_SOURCE wont work Fixes maliit-framework-qt5/0.99.0+git999-r0/recipe-sysroot/usr/include/features.h:376:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp ] | # warning _FORTIFY_SOURCE requires compiling with optimization (-O) | ^~~~~~~ Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| | * qtbase-native: Fix qdbuscpp2xml segfaultKhem Raj2017-07-122-80/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | 0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch alone was causing qdbuscpp2xml to simply segfault on simple invocation Signed-off-by: Khem Raj <raj.khem@gmail.com> Cc: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| | * qt5-ptest.inc: append do_populate_sysroot only for targetMartin Jansa2017-07-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * otherwise it breaks e.g. qtxmlpatterns-native build as shown in: http://errors.yoctoproject.org/Errors/Details/147039/ ERROR: Error executing a python function in exec_python_func() autogenerated: The stack trace of python calls that resulted in this exception/failure was: File: 'exec_python_func() autogenerated', lineno: 2, function: <module> 0001: *** 0002:do_populate_sysroot(d) 0003: File: 'TOPDIR/openembedded-core/meta/classes/staging.bbclass', lineno: 128, function: do_populate_sysroot 0124: 0125:python do_populate_sysroot_setscene () { 0126: sstate_setscene(d) 0127:} *** 0128:addtask do_populate_sysroot_setscene 0129: 0130:def staging_copyfile(c, target, dest, postinsts, seendirs): 0131: import errno 0132: File: 'TOPDIR/openembedded-core/meta/classes/staging.bbclass', lineno: 114, function: copyFiles 0110: 0111:do_populate_sysroot[vardeps] += "${SYSROOT_PREPROCESS_FUNCS}" 0112:do_populate_sysroot[vardepsexclude] += "MULTI_PROVIDER_WHITELIST" 0113: *** 0114:POPULATESYSROOTDEPS = "" 0115:POPULATESYSROOTDEPS_class-target = "virtual/${MLPREFIX}${TARGET_PREFIX}binutils:do_populate_sysroot" 0116:POPULATESYSROOTDEPS_class-nativesdk = "virtual/${TARGET_PREFIX}binutils-crosssdk:do_populate_sysroot" 0117:do_populate_sysroot[depends] += "${POPULATESYSROOTDEPS}" 0118: Exception: FileNotFoundError: [Errno 2] No such file or directory: 'TOPDIR/tmp-glibc/work/x86_64-linux/qtxmlpatterns-native/5.8.0+gitAUTOINC+9f7e01b582-r0/sysroot-destdir/usr/' Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| | * qtwebengine: fix build with gcc7Martin Jansa2017-07-125-22/+208
| | | | | | | | | | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| | * qwt-qt5: Fix rpath issuesKhem Raj2017-07-122-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | It errors out usr/plugins/designer/libqwt_designer_plugin.so [rpaths] QA Issue: qwt-qt5-plugins: found library in wrong location: /usr/plugins/designer/libqwt_designer_plugin.so Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| | * qtquickcontrols2: fix compilation of examples/texteditorSteffen Sledz2017-07-122-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | git/examples/quickcontrols2/texteditor/documenthandler.cpp:284:18: error: invalid use of incomplete type 'class QDebug' qWarning() << "load() called before DocumentHandler has QQmlEngine"; Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de> Acked-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| | * qtquick1: add ptestHuang Qiyu2017-07-122-0/+7
| | | | | | | | | | | | | | | | | | | | | Add ptest for qttools by using provided testsuite in qtquick1. Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| | * qtdeclarative: add ptestHuang Qiyu2017-07-122-0/+6
| | | | | | | | | | | | | | | | | | | | | Add ptest for qttools by using provided testsuite in qtdeclarative. Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| | * qtxmlpatterns: add ptestHuang Qiyu2017-07-122-0/+8
| | | | | | | | | | | | | | | | | | | | | Add ptest for qttools by using provided testsuite in qtxmlpatterns. Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| | * qt5: add qt5-ptest.incHuang Qiyu2017-07-121-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add qt5-ptest.inc file for qt ptest related tasks 1) Rewrite do_compile_ptest task for qt 2) Add new do_compile_ptest_base and task do_install_ptest 3) Write do_populate_sysroot_append to resolve do_compile_ptest_base problem in yocto2.3 The compile error log is shown as follow: cd auto/ && ( test -e Makefile || /yocto/work001/fnst/huangqy/work_qt/build/tmp/work/i586-p oky-linux/qtxmlpatterns/5.8.0+gitAUTOINC+9f7e01b582-r0/recipe-sysroot-native/usr/bin/qt5/qmake -o M akefile /yocto/work001/fnst/huangqy/work_qt/build/tmp/work/i586-poky-linux/qtxmlpatterns/5.8.0+gitA UTOINC+9f7e01b582-r0/git/tests/auto/auto.pro ) && make -f Makefile Project ERROR: Could not find feature xml-schema. Makefile:42: recipe for target 'sub-auto-make_first' failed Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| | * qtwebengine: add PACKAGECONFIG for webrtcDaniel Mack2017-07-011-0/+1
| | | | | | | | | | | | | | | Signed-off-by: Daniel Mack <daniel@zonque.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| | * libconnman-qt5: update to 1.1.10Jonathan Liu2017-07-011-2/+2
| | | | | | | | | | | | | | | Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| | * Revert "qttools: DEPENDS on icu"Martin Jansa2017-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6a42ca074f2fea52985049d49057c178363d847c. http://lists.openembedded.org/pipermail/openembedded-devel/2017-June/113308.html Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| | * qttools: DEPENDS on icuMing Liu2017-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a following QA issue: | QA Issue: nativesdk-qtbase-tools rdepends on nativesdk-libicui18n, but it isn't a build dependency. | QA Issue: nativesdk-qtbase-tools rdepends on nativesdk-libicuuc, but it isn't a build dependency. | QA Issue: nativesdk-qtbase-tools rdepends on nativesdk-libicudata, but it isn't a build dependency. Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| | * qtbase: respect "ld-is-gold" DISTRO_FEATURESDenys Dmytriyenko2017-06-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If not set explicitly, some modules like QtWebKit and QtQuick1 can fail: | make[2]: Entering directory '/OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/build/Source' | rm -f libQt5WebKit.so.5.8.0 libQt5WebKit.so libQt5WebKit.so.5 libQt5WebKit.so.5.8 | linking ../lib/libQt5WebKit.so.5.8.0 | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `__bss_start' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `__bss_start' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `_edata' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `_edata' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `_end' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `_end' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Gui.so:(*IND*+0x0): multiple definition of `__bss_start' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Gui.so:(*IND*+0x0): multiple definition of `_edata' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Gui.so:(*IND*+0x0): multiple definition of `_end' | collect2: error: ld returned 1 exit status | Makefile.api:92: recipe for target '../lib/libQt5WebKit.so.5.8.0' failed | make[2]: *** [../lib/libQt5WebKit.so.5.8.0] Error 1 | make[2]: Leaving directory '/OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/build/Source' | Makefile.QtWebKit:44: recipe for target 'sub-api-pri-make_first-ordered' failed | make[1]: *** [sub-api-pri-make_first-ordered] Error 2 Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * | qt5: add missing commercial licenseKwangsub Kim2017-09-208-8/+8
| | | | | | | | | | | | | | | Change-Id: I001716c726e296050a323d4061b325c77070bb6d Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| * | Fix compiling for qtenginio and qtquick1Andre Hartmann2017-09-182-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... due to incorrect license file hashes. This partly reverts commit 0010e434f6101edf47aa Change-Id: I7b17d512296f5a6160c010a10e66fdaf84049005 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| * | Use correct HostPrefixSamuli Piippo2017-09-122-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Different HostPrefix was used when building Qt and in external SDK's qt.conf. This caused e.g., wrong path in qmodule.pri for PKG_CONFIG_EXECUTABLE. Task-number: QTBUG-63097 Change-Id: I75a21d9f84f02b2fc1195d810bb3c2d6bdcdd9c6 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| * | qt5: update submodulesMikko Gronoff2017-09-0120-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | Update submodules to Qt 5.9.2 (snapshot 3) Change-Id: I584ac7031ecd7eed5f63c87ee29227ccc1a94aab Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| * | qtwebview: remove obsolete patchMikko Gronoff2017-08-302-24/+0
| | | | | | | | | | | | | | | Change-Id: Ifcc5569498cdb51cb88394313d8d1e9caaea3d68 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| * | qt5: update submodulesMikko Gronoff2017-08-2333-33/+33
| | | | | | | | | | | | | | | | | | | | | Update submodules to Qt 5.9.2 (snapshot 2) Change-Id: I6afe4211ef5ba00afc29194879bc1511ea4c5ce8 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| * | qtwebengine: update to 5.9.2Samuli Piippo2017-08-172-8/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | Needs additional patching to resolve host architecture correctly. Task-number: QTBUG-62450 Change-Id: I9bd55839c9a1687ade30006ac9cfd36f5fce4648 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * | qt5: bump version number to 5.9.2Mikko Gronoff2017-08-151-1/+1
| | | | | | | | | | | | | | | Change-Id: I2a272077100e234e8aadf969c1882b9fa688967d Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| * | qtbase: fix Krogoth build regression from efa8aafMatt Hoosier2017-08-153-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With commit efa8aaf82e580a7d32eaaab48eb92d436f2e222a Author: Andreas Müller <schnitzeltony@googlemail.com> Date: Thu Feb 9 00:26:09 2017 qmake5_base.bbclass: set qt.conf by environment variable again we stopped pointing ${OE_QMAKE_QTCONF_PATH} at a valid file and instead directed it to a path which was intended not to exist. The motivation was to permit qtbase/qtbase-native/nativesdk-qtbase to build again after Qt 5.8 started paying attention to the contents of this file. The change as done in efa8aaf works well enough for Morty and subsequent releases' copies of Bitbake, but fails on earlier releases because they lack the following change: commit 2afcbfef2cd1ca568e5225884a8021df38ee3db0 Author: Ross Burton <ross.burton@intel.com> Date: 2016-07-14 13:56:22 bitbake: build: don't use $B as the default cwd for functions The result is that when we build with Krogoth or prior, the body of do_generate_qt_config_file() runs with a cwd of ${B}, which was _not_ the intent of efa8aaf. Because the working directory is ${B}, ${OE_QMAKE_QTCONF_PATH} is written in there too. do_configure() -- whose cwd is by design also ${B} -- then finds the file 'foodummy', and the build breaks for the reasons outlined in efa8aaf. This change simply shifts the implementation tactics to suppress the creation of ${OE_QMAKE_QTCONF_PATH} during qtbase rather than rely on unspecified behavior about the cwd of do_generate_qt_config_file(). Change-Id: I93596ed78cba628d3b673c4fbbcff585e04d4402 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | | qt5: update submodulesMikko Gronoff2017-10-1826-63/+58
| | | | | | | | | | | | | | | | | | | | | | | | Update submodules to Qt 5.10 Beta (except webengine/chromium left as Alpha version) Change-Id: I2b99e7eb7870e41901bbb9622176a95b0c3a9307 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | | qt5: update submodulesMikko Gronoff2017-09-1820-55/+22
| | | | | | | | | | | | | | | | | | | | | Update submodules to Qt 5.10 Alpha Change-Id: I3fe9433c00d5588b179acb676d6db4680596a0df Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | | qtbase: respect "ld-is-gold" DISTRO_FEATURESDenys Dmytriyenko2017-09-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If not set explicitly, some modules like QtWebKit and QtQuick1 can fail: | make[2]: Entering directory '/OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/build/Source' | rm -f libQt5WebKit.so.5.8.0 libQt5WebKit.so libQt5WebKit.so.5 libQt5WebKit.so.5.8 | linking ../lib/libQt5WebKit.so.5.8.0 | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `__bss_start' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `__bss_start' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `_edata' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `_edata' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `_end' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Core.so:(*IND*+0x0): multiple definition of `_end' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Gui.so:(*IND*+0x0): multiple definition of `__bss_start' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Gui.so:(*IND*+0x0): multiple definition of `_edata' | /OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/recipe-sysroot/usr/lib/libQt5Gui.so:(*IND*+0x0): multiple definition of `_end' | collect2: error: ld returned 1 exit status | Makefile.api:92: recipe for target '../lib/libQt5WebKit.so.5.8.0' failed | make[2]: *** [../lib/libQt5WebKit.so.5.8.0] Error 1 | make[2]: Leaving directory '/OE/master/build/tmp/work/armv7ahf-neon-oe-linux-gnueabi/qtwebkit/5.8.0+gitAUTOINC+74ac5b0f34-r0/build/Source' | Makefile.QtWebKit:44: recipe for target 'sub-api-pri-make_first-ordered' failed | make[1]: *** [sub-api-pri-make_first-ordered] Error 2 Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> (cherry picked from commit 3ae86cb32edd1449f702e0a094929ae9b21ce191) Task-number: QTBUG-63083 Change-Id: Iac8a11954a64b666caf5dd7fc0e5e631611f9d01 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | | qt5: update submodulesMikko Gronoff2017-09-0540-140/+105
| | | | | | | | | | | | | | | | | | | | | Update submodules, change from dev to 5.10 branch Change-Id: Iaabd27a1b2db2a3d28d2f3d4377d1386a86646c2 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | | Merge remote-tracking branch 'qtyocto/5.9' into 5.10Mikko Gronoff2017-08-1612-5/+263
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qtyocto/5.9: qt5: update submodules qtbase: update to 5.9.1 RC3 qt5: update submodules qt5: update submodules Merge remote-tracking branch 'qtyocto/upstream/master' into 5.9 qt5: update submodules qtwebengine: fix build with latest oe-core qtremoteobjects: build repc tool for native and nativesdk qtlocation: make mapbox-gl plugin a PACKAGECONFIG option qtwebview: add recipe for Qt WebView qtbase: update to 5.9.0 RC2 Change-Id: Icc5a568edf1f21032a4746eb003bcb111d01bc0f
| * | qt5: update submodulesMikko Gronoff2017-08-1432-32/+32
| | | | | | | | | | | | | | | | | | | | | | | | Update to Qt 5.9.2 (snapshot 1) Task-number: QTBUG-62447 Change-Id: I0a7f23f4efb7f07aea589fdd3f2c5bcf9a633539 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| * | qtbase: update to 5.9.1 RC3v5.9.1Mikko Gronoff2017-06-293-3/+3
| | | | | | | | | | | | | | | Change-Id: Ie2e8ae52e9927d688f82fb2df538ef3e79e7a69c Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| * | qt5: update submodulesMikko Gronoff2017-06-2628-29/+29
| | | | | | | | | | | | | | | | | | | | | Qt 5.9.1 RC2 - added 5.9.1 changefiles & updated webengine Change-Id: I09b98127a01cb67eab728e3ec7ee88a8a4f2ac9c Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| * | qt5: update submodulesSamuli Piippo2017-06-2220-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | Qt 5.9.1 RC Change-Id: Icc5b142d86739ac6dd298187ee22f460972fbd5b Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| * | Merge remote-tracking branch 'qtyocto/upstream/master' into 5.9Mikko Gronoff2017-06-204-0/+141
| |\| | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: python-pyqt5: Add recipe qwt: Add recipe Change-Id: Id384afdd3cb5cc860cc1044431641cdb89aeac21
| | * python-pyqt5: Add recipe.Philip Balister2017-05-162-0/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Build tested on raspberrypi3 * I promise to chase the patch upstream. * v2 auto detects QT_VERSION Signed-off-by: Philip Balister <philip@balister.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-24 07:41:18 +0000