From 77ed8fb225093148583d4d119b89c26d4acc4ee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= 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/qtbase_git.bb') 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 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/qtbase_git.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'recipes-qt/qt5/qtbase_git.bb') 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 From 47d1132b1dc2521299f5041dbb61c8afc29461fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= 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/qtbase_git.bb') 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 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/qtbase_git.bb') 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