From b4ef02e25720b3b51dc7656082d358bc699ee17d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 21 Feb 2018 14:36:15 +0100 Subject: [PATCH] sddm: fix build for Qt 5.10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Further explanation at [1] Checked for Qt 5.9: IMPORTS_INSTALL_DIR path was set to qtbase-native's sysroot. From code it seems sddm used default theme as default so this bug was not detected. There was always done the wrong thing but it turned into a bug by oe's recipe specific sysroot. [1] http://lists.openembedded.org/pipermail/openembedded-devel/2018-February/116806.html Signed-off-by: Andreas Müller --- recipes-misc/recipes-graphics/sddm/sddm_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-misc/recipes-graphics/sddm/sddm_git.bb b/recipes-misc/recipes-graphics/sddm/sddm_git.bb index fd8e1282..c3840cdd 100644 --- a/recipes-misc/recipes-graphics/sddm/sddm_git.bb +++ b/recipes-misc/recipes-graphics/sddm/sddm_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \ REQUIRED_DISTRO_FEATURES = "x11" -inherit cmake_qt5_extra pkgconfig systemd useradd distro_features_check +inherit cmake_qt5_extra qmake5_base pkgconfig systemd useradd distro_features_check DEPENDS += "extra-cmake-modules-native qtbase qtdeclarative qttools libxcb" # REVISIT optionals @@ -32,7 +32,7 @@ EXTRA_OECMAKE += "-DQML_INSTALL_DIR=${OE_QMAKE_PATH_QML}" do_configure_append() { # fix sysroot path - sed -i 's:${STAGING_DIR_NATIVE}.*${libdir}:${libdir}:g' ${B}/src/common/Constants.h + sed -i 's:${STAGING_DIR_HOST}.*${libdir}:${libdir}:g' ${B}/src/common/Constants.h } do_install_append() {