From 75c7d00e109512c133167255e5a9e86fda43f07f Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Mon, 18 Feb 2019 18:03:26 +0100 Subject: qt5-creator: Do not ship two desktop files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These days qtcreator ships desktop file - so use that. Signed-off-by: Andreas Müller --- recipes-qt/qt5/qt5-creator_git.bb | 5 ----- 1 file changed, 5 deletions(-) (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/qt5-creator_git.bb b/recipes-qt/qt5/qt5-creator_git.bb index 344c956e..6a8887ed 100644 --- a/recipes-qt/qt5/qt5-creator_git.bb +++ b/recipes-qt/qt5/qt5-creator_git.bb @@ -27,7 +27,6 @@ SRC_URI = " \ git://code.qt.io/qt-creator/qt-creator.git;branch=4.7 \ file://0002-botan.pro-pass-QMAKE_AR.patch \ file://0001-botan-Always-define-BOTAN_ARCH_SWITCH-when-cross-bui.patch \ - file://qtcreator.desktop.in \ " SRC_URI_append_libc-musl = " file://0003-Link-with-libexecinfo-on-musl.patch" @@ -50,10 +49,6 @@ do_configure_append() { do_install() { oe_runmake install INSTALL_ROOT=${D}${prefix} - # install desktop and ensure that qt-creator finds qmake - install -d ${D}${datadir}/applications - install -m 0644 ${WORKDIR}/qtcreator.desktop.in ${D}${datadir}/applications/qtcreator.desktop - sed -i 's:@QT5_QMAKE@:${OE_QMAKE_PATH_QT_BINS}:g' ${D}${datadir}/applications/qtcreator.desktop } do_install_append_toolchain-clang () { # Remove RPATHs embedded in bins -- cgit v1.2.3-54-g00ecf From 77ed8fb225093148583d4d119b89c26d4acc4ee5 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Fri, 22 Feb 2019 13:11:56 +0100 Subject: qtbase: Adjust target mkspec settings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * linux-oe-g++ won't work use linux-g++ by default * we doe not cross compile on target * adjustment are done at postinst to keep build sysroots unmodified Signed-off-by: Andreas Müller --- recipes-qt/qt5/qtbase_git.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index adf0a43c..ca31626b 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -272,4 +272,19 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" +TARGET_MKSPEC ?= "linux-g++" + +# use clean mkspecs on target +pkg_postinst_${PN}-tools () { +sed -i \ + -e 's:HostSpec =.*:HostSpec = ${TARGET_MKSPEC}:g' \ + -e 's:TargetSpec =.*:TargetSpec = ${TARGET_MKSPEC}:g' \ + $D${bindir}/qt.conf +sed -i 's: cross_compile : :g' $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qconfig.pri +sed -i \ + -e 's: cross_compile : :g' \ + -e 's:HOST_QT_TOOLS =.*::g' \ + $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri +} + SRCREV = "13ed06640c6cf32ea8c784c896c6bf017053edb3" -- cgit v1.2.3-54-g00ecf From 6280befe6c4dbbc5ac8f384cda4480a1b896b1dd Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 1 Mar 2019 12:12:11 +0000 Subject: qtscript: add fix for build with gcc 8.3 * fixes issue introduced with gcc upgrade to 8.3: | /OE/build/luneos-master/webos-ports/tmp-glibc/work/i586-webos-linux/qtscript/5.12.0+gitAUTOINC+0be84da600-r0/git/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp:157:5: error: expected '(' before 'volatile' | asm volatile ( | ^~~~~~~~ | ( | /OE/build/luneos-master/webos-ports/tmp-glibc/work/i586-webos-linux/qtscript/5.12.0+gitAUTOINC+0be84da600-r0/git/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp:158:1: error: expected unqualified-id before string constant | ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" | ^~~~~~~~~ Signed-off-by: Martin Jansa --- .../qt5/qtscript/0002-Fix-build-with-GCC-8.3.patch | 235 +++++++++++++++++++++ recipes-qt/qt5/qtscript_git.bb | 3 +- 2 files changed, 237 insertions(+), 1 deletion(-) create mode 100644 recipes-qt/qt5/qtscript/0002-Fix-build-with-GCC-8.3.patch (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/qtscript/0002-Fix-build-with-GCC-8.3.patch b/recipes-qt/qt5/qtscript/0002-Fix-build-with-GCC-8.3.patch new file mode 100644 index 00000000..629cf8e8 --- /dev/null +++ b/recipes-qt/qt5/qtscript/0002-Fix-build-with-GCC-8.3.patch @@ -0,0 +1,235 @@ +From 03cdaf779e0d8587c6e110f1f834a15e2d3317fd Mon Sep 17 00:00:00 2001 +From: Thiago Macieira +Date: Mon, 28 Jan 2019 14:33:12 -0800 +Subject: [PATCH] Fix build with GCC 8.3 + +Qualifiers in the asm statement are not allowed in the global scope. I +thought they were necessary for LTO, but I the commit to this file that +added them predates my work on setting up LTO for GCC. + +Change-Id: Id98140e1c2f0426cabbefffd157e23e5ece67a49 +Reviewed-by: Allan Sandfeld Jensen +--- + .../JavaScriptCore/jit/JITStubs.cpp | 48 +++++++++---------- + 1 file changed, 24 insertions(+), 24 deletions(-) + +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp +index 1abdf8b..9f60761 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp +@@ -116,7 +116,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, savedEBX) == 0x3c, JITStackFrame_s + COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x58, JITStackFrame_callFrame_offset_matches_ctiTrampoline); + COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x50, JITStackFrame_code_offset_matches_ctiTrampoline); + +-asm volatile ( ++asm ( + ".text\n" + ".globl " SYMBOL_STRING(ctiTrampoline) "\n" + HIDE_SYMBOL(ctiTrampoline) "\n" +@@ -138,7 +138,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" + "ret" "\n" + ); + +-asm volatile ( ++asm ( + ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" + HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" + SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" +@@ -154,7 +154,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" + "ret" "\n" + ); + +-asm volatile ( ++asm ( + ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" + HIDE_SYMBOL(ctiOpThrowNotCaught) "\n" + SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" +@@ -179,7 +179,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, savedRBX) == 0x48, JITStackFrame_s + COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x90, JITStackFrame_callFrame_offset_matches_ctiTrampoline); + COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x80, JITStackFrame_code_offset_matches_ctiTrampoline); + +-asm volatile ( ++asm ( + ".globl " SYMBOL_STRING(ctiTrampoline) "\n" + HIDE_SYMBOL(ctiTrampoline) "\n" + SYMBOL_STRING(ctiTrampoline) ":" "\n" +@@ -206,7 +206,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" + "ret" "\n" + ); + +-asm volatile ( ++asm ( + ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" + HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" + SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" +@@ -222,7 +222,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" + "ret" "\n" + ); + +-asm volatile ( ++asm ( + ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" + HIDE_SYMBOL(ctiOpThrowNotCaught) "\n" + SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" +@@ -242,7 +242,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" + #error "JIT_STUB_ARGUMENT_VA_LIST not supported on ARMv7." + #endif + +-asm volatile ( ++asm ( + ".text" "\n" + ".align 2" "\n" + ".globl " SYMBOL_STRING(ctiTrampoline) "\n" +@@ -269,7 +269,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" + "bx lr" "\n" + ); + +-asm volatile ( ++asm ( + ".text" "\n" + ".align 2" "\n" + ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" +@@ -287,7 +287,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" + "bx lr" "\n" + ); + +-asm volatile ( ++asm ( + ".text" "\n" + ".align 2" "\n" + ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" +@@ -305,7 +305,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" + + #elif COMPILER(GCC) && CPU(ARM_TRADITIONAL) + +-asm volatile ( ++asm ( + ".globl " SYMBOL_STRING(ctiTrampoline) "\n" + HIDE_SYMBOL(ctiTrampoline) "\n" + SYMBOL_STRING(ctiTrampoline) ":" "\n" +@@ -323,7 +323,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" + "mov pc, lr" "\n" + ); + +-asm volatile ( ++asm ( + ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" + HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" + SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" +@@ -418,7 +418,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x38, JITStackFrame_ + COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x30, JITStackFrame_code_offset_matches_ctiTrampoline); + COMPILE_ASSERT(offsetof(struct JITStackFrame, savedEBX) == 0x1c, JITStackFrame_stub_argument_space_matches_ctiTrampoline); + +-asm volatile ( ++asm ( + ".text\n" + ".globl " SYMBOL_STRING(ctiTrampoline) "\n" + HIDE_SYMBOL(ctiTrampoline) "\n" +@@ -440,7 +440,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" + "ret" "\n" + ); + +-asm volatile ( ++asm ( + ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" + HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" + SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" +@@ -456,7 +456,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" + "ret" "\n" + ); + +-asm volatile ( ++asm ( + ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" + HIDE_SYMBOL(ctiOpThrowNotCaught) "\n" + SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" +@@ -480,7 +480,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x58, JITStackFrame_ + COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x48, JITStackFrame_code_offset_matches_ctiTrampoline); + COMPILE_ASSERT(offsetof(struct JITStackFrame, savedRBX) == 0x78, JITStackFrame_stub_argument_space_matches_ctiTrampoline); + +-asm volatile ( ++asm ( + ".text\n" + ".globl " SYMBOL_STRING(ctiTrampoline) "\n" + HIDE_SYMBOL(ctiTrampoline) "\n" +@@ -515,7 +515,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" + "ret" "\n" + ); + +-asm volatile ( ++asm ( + ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" + HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" + SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" +@@ -531,7 +531,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" + "ret" "\n" + ); + +-asm volatile ( ++asm ( + ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" + HIDE_SYMBOL(ctiOpThrowNotCaught) "\n" + SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" +@@ -551,7 +551,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" + #error "JIT_STUB_ARGUMENT_VA_LIST not supported on ARMv7." + #endif + +-asm volatile ( ++asm ( + ".text" "\n" + ".align 2" "\n" + ".globl " SYMBOL_STRING(ctiTrampoline) "\n" +@@ -578,7 +578,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" + "bx lr" "\n" + ); + +-asm volatile ( ++asm ( + ".text" "\n" + ".align 2" "\n" + ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" +@@ -596,7 +596,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" + "bx lr" "\n" + ); + +-asm volatile ( ++asm ( + ".text" "\n" + ".align 2" "\n" + ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" +@@ -614,7 +614,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" + + #elif COMPILER(GCC) && CPU(ARM_TRADITIONAL) + +-asm volatile ( ++asm ( + ".text\n" + ".globl " SYMBOL_STRING(ctiTrampoline) "\n" + HIDE_SYMBOL(ctiTrampoline) "\n" +@@ -632,7 +632,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" + "mov pc, lr" "\n" + ); + +-asm volatile ( ++asm ( + ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" + HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" + SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" +@@ -1024,7 +1024,7 @@ static NEVER_INLINE void throwStackOverflowError(CallFrame* callFrame, JSGlobalD + extern "C" { \ + rtype JITStubThunked_##op(STUB_ARGS_DECLARATION); \ + }; \ +- asm volatile ( \ ++ asm ( \ + ".text" "\n" \ + ".align 2" "\n" \ + ".globl " SYMBOL_STRING(cti_##op) "\n" \ +@@ -1053,7 +1053,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, thunkReturnAddress) == THUNK_RETUR + extern "C" { \ + rtype JITStubThunked_##op(STUB_ARGS_DECLARATION); \ + }; \ +- asm volatile ( \ ++ asm ( \ + ".globl " SYMBOL_STRING(cti_##op) "\n" \ + HIDE_SYMBOL(cti_##op) "\n" \ + SYMBOL_STRING(cti_##op) ":" "\n" \ diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index ed2f82ec..a6b6429c 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -12,9 +12,10 @@ LIC_FILES_CHKSUM = " \ " # Patches from https://github.com/meta-qt5/qtscript/commits/b5.12 -# 5.12.meta-qt5.1 +# 5.12.meta-qt5.2 SRC_URI += " \ file://0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch \ + file://0002-Fix-build-with-GCC-8.3.patch \ " # qemuarm build fails with: -- cgit v1.2.3-54-g00ecf From e117b58d16ead9debac214bfce9a44817975c427 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 1 Mar 2019 15:15:10 -0800 Subject: qtbase: Fix test builds with clang/x86_64 Signed-off-by: Khem Raj --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 1 + recipes-qt/qt5/qtbase-native_git.bb | 1 + .../qt5/qtbase/0023-build-failure-with-clang.patch | 48 ++++++++++++++++++++++ recipes-qt/qt5/qtbase_git.bb | 1 + 4 files changed, 51 insertions(+) create mode 100644 recipes-qt/qt5/qtbase/0023-build-failure-with-clang.patch (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 1a0e38eb..987d156f 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -45,6 +45,7 @@ SRC_URI += "\ file://0018-Fix-compile-issue-with-gcc-9.patch \ file://0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch \ file://0020-Fix-qbswap-calls-for-Big-Endian-targets.patch \ + file://0023-build-failure-with-clang.patch \ " # common for qtbase-native and nativesdk-qtbase diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index e636167e..51cc6c4a 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -40,6 +40,7 @@ SRC_URI += "\ file://0018-Fix-compile-issue-with-gcc-9.patch \ file://0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch \ file://0020-Fix-qbswap-calls-for-Big-Endian-targets.patch \ + file://0023-build-failure-with-clang.patch \ " # common for qtbase-native and nativesdk-qtbase diff --git a/recipes-qt/qt5/qtbase/0023-build-failure-with-clang.patch b/recipes-qt/qt5/qtbase/0023-build-failure-with-clang.patch new file mode 100644 index 00000000..0576a22c --- /dev/null +++ b/recipes-qt/qt5/qtbase/0023-build-failure-with-clang.patch @@ -0,0 +1,48 @@ +From f958dccc8c7c777aaca1f110ed48c71b28fdea92 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 1 Mar 2019 15:11:19 -0800 +Subject: [PATCH] Fix build failure with clang + +Complement below commit + +commit 1555894dec537cbc422f43fe959b0d0ee0000881 +Author: Thiago Macieira +Date: Wed Jul 25 19:04:20 2018 -0700 + + QCborValue: Disable support for spaceship operator + + __has_include() is not the correct way to detect this feature, + since that's a library header and may be provided by an implementation + (libc++) before the compiler supports the syntax. + + Change-Id: I80aae0d068974d83b6c0fffd1544c8e558e2446b + Reviewed-by: Edward Welbourne + +Fixes +tst_qcborvalue.cpp:336:17: error: invalid operands to binary expression ('QCborValue' and 'QCborValue') + QVERIFY(!(v > other)); + ~ ^ ~~~~~ + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp b/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp +index 38b26e7de4..4b753eab6b 100644 +--- a/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp ++++ b/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp +@@ -330,7 +330,7 @@ void tst_QCborValue::copyCompare() + QCOMPARE(v, other); + QVERIFY(!(v != other)); + QVERIFY(!(v < other)); +-#if QT_HAS_INCLUDE() ++#if 0 && QT_HAS_INCLUDE() + QVERIFY(v <= other); + QVERIFY(v >= other); + QVERIFY(!(v > other)); +-- +2.21.0 + diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index ca31626b..a9c17559 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -36,6 +36,7 @@ SRC_URI += "\ file://0018-Fix-compile-issue-with-gcc-9.patch \ file://0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch \ file://0020-Fix-qbswap-calls-for-Big-Endian-targets.patch \ + file://0023-build-failure-with-clang.patch \ " -- cgit v1.2.3-54-g00ecf From 92c34de4bb11223c059466d3d0690eb763a56102 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 8 Jan 2019 14:51:33 +0200 Subject: qt5: cleanup mkspecs QMAKE_COMPILER is not meant to be the actual compiler, but a compiler type (gcc, clang, mingw). For both mkspecs it's already set in the common includes. Remove wayland and debug settings from the clang mkspec as they are already removed from the gcc mkspec. Signed-off-by: Samuli Piippo --- classes/qmake5_base.bbclass | 2 -- .../qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 21 ++++++++++----------- ...9-Add-OE-specific-specs-for-clang-compiler.patch | 15 ++++++--------- 3 files changed, 16 insertions(+), 22 deletions(-) (limited to 'recipes-qt/qt5') diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index b3a4826a..48da05e8 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -20,7 +20,6 @@ SSTATE_SCAN_FILES += "*.pri *.prl *.prf" # then OE_QMAKE_CFLAGS are exported and used correctly, but then whole CFLAGS is overwritten from env (and -fPIC lost and build fails) EXTRA_OEMAKE = " \ MAKEFLAGS='${PARALLEL_MAKE}' \ - OE_QMAKE_COMPILER='${OE_QMAKE_COMPILER}' \ OE_QMAKE_CC='${OE_QMAKE_CC}' \ OE_QMAKE_CXX='${OE_QMAKE_CXX}' \ OE_QMAKE_CFLAGS='${OE_QMAKE_CFLAGS}' \ @@ -33,7 +32,6 @@ EXTRA_OEMAKE = " \ " OE_QMAKE_QMAKE = "${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake" -export OE_QMAKE_COMPILER = "${CC}" export OE_QMAKE_CC = "${CC}" export OE_QMAKE_CFLAGS = "${CFLAGS}" export OE_QMAKE_CXX = "${CXX}" diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index 0a3cbf92..3f35e7dd 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch @@ -1,4 +1,4 @@ -From 3701cce26ce6f90e4b5e4c71c73d333d43b5ac08 Mon Sep 17 00:00:00 2001 +From 5a9a1e8da67d2bf1672982f087995c8e0e8b3577 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 15 Apr 2013 04:29:32 +0200 Subject: [PATCH] Add linux-oe-g++ platform @@ -24,14 +24,14 @@ Signed-off-by: Martin Jansa mkspecs/features/configure.prf | 4 +-- mkspecs/features/qt.prf | 6 ++--- mkspecs/features/qt_functions.prf | 2 +- - mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++++++++++++++++ + mkspecs/linux-oe-g++/qmake.conf | 39 ++++++++++++++++++++++++++++ mkspecs/linux-oe-g++/qplatformdefs.h | 1 + - 6 files changed, 48 insertions(+), 7 deletions(-) + 6 files changed, 47 insertions(+), 7 deletions(-) create mode 100644 mkspecs/linux-oe-g++/qmake.conf create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h diff --git a/configure b/configure -index ef7bad1bfc..dcca0f9135 100755 +index ef7bad1bfce..dcca0f91359 100755 --- a/configure +++ b/configure @@ -712,7 +712,7 @@ fi @@ -44,7 +44,7 @@ index ef7bad1bfc..dcca0f9135 100755 # build qmake diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf -index 934a18a924..0f5b1b6333 100644 +index 934a18a9249..0f5b1b63334 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -46,14 +46,14 @@ defineTest(qtCompileTest) { @@ -65,7 +65,7 @@ index 934a18a924..0f5b1b6333 100644 msg = "test $$1 succeeded" write_file($$QMAKE_CONFIG_LOG, msg, append) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index d16b3cf1be..df219ce34c 100644 +index 90e318e2a48..3e8568ed675 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -147,7 +147,7 @@ import_plugins:qtConfig(static) { @@ -89,7 +89,7 @@ index d16b3cf1be..df219ce34c 100644 # run qmlimportscanner qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, , system) diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 1903e509c8..c093dd4592 100644 +index 1903e509c8e..c093dd4592d 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -69,7 +69,7 @@ defineTest(qtHaveModule) { @@ -103,10 +103,10 @@ index 1903e509c8..c093dd4592 100644 cmd = perl -w $$system_path($${cmd}.pl) diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf new file mode 100644 -index 0000000000..f34a66599a +index 00000000000..c202c47fa15 --- /dev/null +++ b/mkspecs/linux-oe-g++/qmake.conf -@@ -0,0 +1,40 @@ +@@ -0,0 +1,39 @@ +# +# qmake configuration for linux-g++ with modifications for building with OpenEmbedded +# @@ -131,7 +131,6 @@ index 0000000000..f34a66599a +include(../common/g++-unix.conf) + +# tc settings from g++-base.conf -+QMAKE_COMPILER = $$(OE_QMAKE_COMPILER) gcc +QMAKE_CC = $$(OE_QMAKE_CC) +QMAKE_CXX = $$(OE_QMAKE_CXX) + @@ -149,7 +148,7 @@ index 0000000000..f34a66599a +load(qt_config) diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h new file mode 100644 -index 0000000000..5d22fb4101 +index 00000000000..5d22fb41013 --- /dev/null +++ b/mkspecs/linux-oe-g++/qplatformdefs.h @@ -0,0 +1 @@ diff --git a/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch index 664767dd..5a9eb404 100644 --- a/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch +++ b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch @@ -1,22 +1,22 @@ -From 12d00d903a16dba6f7aad0f4652addbd395765fe Mon Sep 17 00:00:00 2001 +From 289f366363eeca03c27fd718c8b3ae53dcc28586 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 3 Sep 2017 09:11:44 -0700 Subject: [PATCH] Add OE specific specs for clang compiler Signed-off-by: Khem Raj --- - mkspecs/linux-oe-clang/qmake.conf | 42 ++++++++++++++++++++++++++ + mkspecs/linux-oe-clang/qmake.conf | 39 ++++++++++++++++++++++++++ mkspecs/linux-oe-clang/qplatformdefs.h | 1 + - 2 files changed, 43 insertions(+) + 2 files changed, 40 insertions(+) create mode 100644 mkspecs/linux-oe-clang/qmake.conf create mode 100644 mkspecs/linux-oe-clang/qplatformdefs.h diff --git a/mkspecs/linux-oe-clang/qmake.conf b/mkspecs/linux-oe-clang/qmake.conf new file mode 100644 -index 0000000000..443d4b0dff +index 00000000000..db02ab5215f --- /dev/null +++ b/mkspecs/linux-oe-clang/qmake.conf -@@ -0,0 +1,42 @@ +@@ -0,0 +1,39 @@ +# +# qmake configuration for linux-g++ with modifications for building with OpenEmbedded +# @@ -41,12 +41,9 @@ index 0000000000..443d4b0dff +include(../common/clang.conf) + +# tc settings from g++-base.conf -+QMAKE_COMPILER = $$(OE_QMAKE_COMPILER) clang +QMAKE_CC = $$(OE_QMAKE_CC) +QMAKE_CXX = $$(OE_QMAKE_CXX) + -+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(OE_QMAKE_CFLAGS) -+ +QMAKE_LINK = $$(OE_QMAKE_LINK) +QMAKE_LINK_SHLIB = $$(OE_QMAKE_LINK) +QMAKE_LINK_C = $$(OE_QMAKE_LINK) @@ -61,7 +58,7 @@ index 0000000000..443d4b0dff +load(qt_config) diff --git a/mkspecs/linux-oe-clang/qplatformdefs.h b/mkspecs/linux-oe-clang/qplatformdefs.h new file mode 100644 -index 0000000000..880c927b21 +index 00000000000..880c927b218 --- /dev/null +++ b/mkspecs/linux-oe-clang/qplatformdefs.h @@ -0,0 +1 @@ -- cgit v1.2.3-54-g00ecf From fe88b99ad393fef1b97ed755209dd4161ed7af07 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 8 Jan 2019 11:05:29 +0200 Subject: nativesdk-qtbase: use rpath for nativesdk Qt tools rpath is needed to be able to run qt tools from the sdk without having the sdk's lib dir explicitly in LD_LIBRARY_PATH or relying on host libraries. Qt uses relative rpaths, so the build directories are not used there. Signed-off-by: Samuli Piippo --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 -- 1 file changed, 2 deletions(-) (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 987d156f..f4d60bc7 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -81,7 +81,6 @@ QT_CONFIG_FLAGS += " \ -shared \ -silent \ -no-pch \ - -no-rpath \ -pkg-config \ ${PACKAGECONFIG_CONFARGS} \ " @@ -143,7 +142,6 @@ do_configure() { -nomake examples \ -nomake tests \ -no-compile-examples \ - -no-rpath \ -platform ${OE_QMAKE_PLATFORM_NATIVE} \ -xplatform ${OE_QMAKE_PLATFORM} \ ${QT_CONFIG_FLAGS} -- cgit v1.2.3-54-g00ecf From 87f04621f3ceba43a2409b243cfe68f3dcaa4eff Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 18 Feb 2019 10:20:32 +0200 Subject: qttools/cmake: use OE_QMAKE_PATH_EXTERNAL_HOST_BINS Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS in Linguist cmake file similarly to qtbase's cmake files. This fixes usage in external toolchain. Task-number: QTBUG-73758 Signed-off-by: Samuli Piippo --- ...ols-cmake-allow-overriding-the-location-f.patch | 61 ++++++++-------------- 1 file changed, 21 insertions(+), 40 deletions(-) (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch b/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch index c1f14d4a..6f8e7f91 100644 --- a/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch +++ b/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch @@ -1,60 +1,41 @@ -From cc5d0bc4434805fc78e9e7045810c1e0c323ad61 Mon Sep 17 00:00:00 2001 -From: Cody P Schafer -Date: Thu, 9 Jul 2015 11:28:19 -0400 +From 3f7d07226745370dd6dfc3ffddec5f00ea9b75e1 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Mon, 18 Feb 2019 10:45:03 +0200 Subject: [PATCH] linguist-tools cmake: allow overriding the location for lupdate and lrelease --- - src/linguist/Qt5LinguistToolsConfig.cmake.in | 15 +++------------ - 1 file changed, 3 insertions(+), 12 deletions(-) + src/linguist/Qt5LinguistToolsConfig.cmake.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/linguist/Qt5LinguistToolsConfig.cmake.in b/src/linguist/Qt5LinguistToolsConfig.cmake.in -index 4318b16f..2e3b70fa 100644 +index 4318b16f..f957a384 100644 --- a/src/linguist/Qt5LinguistToolsConfig.cmake.in +++ b/src/linguist/Qt5LinguistToolsConfig.cmake.in -@@ -26,6 +26,9 @@ get_filename_component(_qt5_linguisttools_install_prefix \"${CMAKE_CURRENT_LIST_ - !!ELSE - set(_qt5_linguisttools_install_prefix \"$$[QT_INSTALL_PREFIX]\") - !!ENDIF -+if (OE_QMAKE_PATH_HOST_PREFIX) -+ set(_qt5_linguisttools_install_prefix \"${OE_QMAKE_PATH_HOST_PREFIX}\") -+endif() - - macro(_qt5_LinguistTools_check_file_exists file) - if(NOT EXISTS \"${file}\" ) -@@ -44,11 +47,7 @@ endmacro() - if (NOT TARGET Qt5::lrelease) - add_executable(Qt5::lrelease IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +@@ -47,7 +47,7 @@ if (NOT TARGET Qt5::lrelease) + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\") --!!ELSE + !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\") --!!ENDIF ++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lrelease${OE_QMAKE_BIN_SUFFIX}\") + !!ENDIF _qt5_LinguistTools_check_file_exists(${imported_location}) - set_target_properties(Qt5::lrelease PROPERTIES -@@ -59,11 +58,7 @@ endif() - if (NOT TARGET Qt5::lupdate) - add_executable(Qt5::lupdate IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +@@ -62,7 +62,7 @@ if (NOT TARGET Qt5::lupdate) + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\") --!!ELSE + !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\") --!!ENDIF ++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lupdate${OE_QMAKE_BIN_SUFFIX}\") + !!ENDIF _qt5_LinguistTools_check_file_exists(${imported_location}) - set_target_properties(Qt5::lupdate PROPERTIES -@@ -74,11 +69,7 @@ endif() - if (NOT TARGET Qt5::lconvert) - add_executable(Qt5::lconvert IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +@@ -77,7 +77,7 @@ if (NOT TARGET Qt5::lconvert) + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\") --!!ELSE + !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\") --!!ENDIF ++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lconvert${OE_QMAKE_BIN_SUFFIX}\") + !!ENDIF _qt5_LinguistTools_check_file_exists(${imported_location}) - set_target_properties(Qt5::lconvert PROPERTIES -- cgit v1.2.3-54-g00ecf From 47d1132b1dc2521299f5041dbb61c8afc29461fd Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Thu, 14 Mar 2019 16:11:46 +0100 Subject: qtbase: fix target mkspec adjustment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit mkspecs are not part of qtbase-tools Signed-off-by: Andreas Müller --- recipes-qt/qt5/qtbase_git.bb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index a9c17559..2f23fa88 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -281,6 +281,9 @@ sed -i \ -e 's:HostSpec =.*:HostSpec = ${TARGET_MKSPEC}:g' \ -e 's:TargetSpec =.*:TargetSpec = ${TARGET_MKSPEC}:g' \ $D${bindir}/qt.conf +} + +pkg_postinst_${PN}-mkspecs () { sed -i 's: cross_compile : :g' $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qconfig.pri sed -i \ -e 's: cross_compile : :g' \ -- cgit v1.2.3-54-g00ecf From 0b0a608ddc55acf1f817aee03e65a06017239bed Mon Sep 17 00:00:00 2001 From: Francesco Giancane Date: Fri, 8 Mar 2019 15:47:17 +0100 Subject: qtbase: let user decide how to link openssl to Qt5 libraries Switch from the configure script was extended from -openssl to -openssl-{linked,runtime} so that one can select whether to enable ssl library at linking time or runtime (with dlopen()), or letting the build system decide if no flag is specified. Now with the OPENSSL_LINKING_MODE variable, it is possible to decide which linking mode to be used. Signed-off-by: Francesco Giancane Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase_git.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 2f23fa88..821eb95c 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -94,6 +94,9 @@ PACKAGECONFIG ?= " \ ${PACKAGECONFIG_SYSTEM} \ ${PACKAGECONFIG_DISTRO} \ " +# Choose whether to link to OpenSSL library at linking time or run time +# Leave the variable empty to let the buildsystem decide, or specify -linked or -runtime +OPENSSL_LINKING_MODE ??= "" PACKAGECONFIG[static] = "-static,-shared" PACKAGECONFIG[release] = "-release,-debug" @@ -153,7 +156,7 @@ PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl" PACKAGECONFIG[gbm] = "-gbm,-no-gbm,virtual/libgbm" PACKAGECONFIG[icu] = "-icu,-no-icu,icu" PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev" -PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" +PACKAGECONFIG[openssl] = "-openssl${OPENSSL_LINKING_MODE},-no-openssl,openssl,libssl" PACKAGECONFIG[widgets] = "-widgets,-no-widgets" PACKAGECONFIG[libproxy] = "-libproxy,-no-libproxy,libproxy" PACKAGECONFIG[libinput] = "-libinput,-no-libinput,libinput" -- cgit v1.2.3-54-g00ecf