From 3e2058f2e735bbfd15723ce9de27ad8df78a5500 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 14 Jan 2016 09:29:53 +0200 Subject: qt5: allow overriding git protocol used with QT_GIT uri Add option QT_GIT_PROTOCOL to specify the protocol to be used with the QT_GIT uri. Signed-off-by: Samuli Piippo Signed-off-by: Martin Jansa --- conf/layer.conf | 1 + recipes-qt/qt5/qt5-git.inc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/layer.conf b/conf/layer.conf index f83bd967..b7207e63 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -28,3 +28,4 @@ LICENSE_PATH += "${LAYERDIR}/licenses" IMAGE_FEATURES[validitems] += "qtcreator-debug" QT_GIT ?= "git://github.com/qtproject" +QT_GIT_PROTOCOL ?= "git" diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 172a170e..f8fb38b7 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -6,7 +6,7 @@ QT_MODULE_BRANCH ?= "5.6" # each module needs to define valid SRCREV SRC_URI = " \ - ${QT_GIT}/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \ + ${QT_GIT}/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH};protocol=${QT_GIT_PROTOCOL} \ " S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf From 3bd297278dff1ae12d1241dc21e1e2643d7ccee2 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 12 Jan 2016 16:21:18 +0200 Subject: qtbase: re-enable replacing host paths in qconfig.pri Uncomment code that replaces host paths with qmake built-in properties in qconfig.pri. Modified to replace paths in all *.pri files in mkspecs directory and to also change paths without space in front of it. Signed-off-by: Samuli Piippo Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 7ee5f562..8f519fa7 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -222,9 +222,9 @@ do_install_append() { rm -rf ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/macx-ios-clang # Replace host paths with qmake built-in properties -# sed -i -e 's| ${STAGING_DIR_NATIVE}${prefix_native}| $$[QT_HOST_PREFIX]|g' \ -# -e 's| ${STAGING_DIR_HOST}| $$[QT_SYSROOT]|g' \ -# ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/qconfig.pri + sed -i -e 's|${STAGING_DIR_NATIVE}${prefix_native}|$$[QT_HOST_PREFIX]|g' \ + -e 's|${STAGING_DIR_HOST}|$$[QT_SYSROOT]|g' \ + ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/*.pri } PACKAGES =. " \ -- cgit v1.2.3-54-g00ecf From 4a0acfa4111600b7cb5ae7b16cd6bfa5df2e2123 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 5 Jan 2016 09:31:02 +0200 Subject: qtbase: use PACKAGECONFIG to ensure runtime dependency to libssl Using openssl-linked configure has side effect that gdb catches the SIGILL signal, which openssl uses internally on ARM, every time when starting debugging any Qt application. This is annoying and somewhat confusing behavior even with QtCreator. Using the default openssl configure argument prevents this, while using the 4th argument for PACKAGECONFIG keeps the runtime dependency to libssl correctly in place. Signed-off-by: Samuli Piippo Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase_git.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 8f519fa7..8b6f509d 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -121,8 +121,7 @@ PACKAGECONFIG[kms] = "-kms,-no-kms,virtual/mesa virtual/egl" # needed for qtwebkit PACKAGECONFIG[icu] = "-icu,-no-icu,icu" PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev" -# use -openssl-linked here to ensure that RDEPENDS for libcrypto and libssl are detected -PACKAGECONFIG[openssl] = "-openssl-linked,-no-openssl,openssl" +PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" PACKAGECONFIG[alsa] = "-alsa,-no-alsa,alsa-lib" PACKAGECONFIG[pulseaudio] = "-pulseaudio,-no-pulseaudio,pulseaudio" PACKAGECONFIG[nis] = "-nis,-no-nis" -- cgit v1.2.3-54-g00ecf