From 34a3a4bf4b58ea7e63ff81eaf35963cbd4cf59b5 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Mon, 8 Jan 2018 06:52:07 +0100 Subject: [PATCH] qtbase: fix a regression A flaw was introduced by commit b8a236df: [ qt5: Fix cmake config files ] Removing ${S}/include must be done before configure script being called, but it's not in that case for qtbase-native recipe after the commit, that is saying, ${S}/include was removed after configure being called, which causes compiling issues for native build. Further more, the logic introduced by commit b8a236df should only apply to qtbase recipes, so they should be moved to qtbase recipes as well. Signed-off-by: Ming Liu Signed-off-by: Martin Jansa --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 5 +++++ recipes-qt/qt5/qt5-native.inc | 7 ------- recipes-qt/qt5/qt5.inc | 7 ------- recipes-qt/qt5/qtbase-native_git.bb | 5 +++++ recipes-qt/qt5/qtbase_git.bb | 5 +++++ 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 3aeb2ab..4f4a0c3 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -102,6 +102,11 @@ OE_QMAKE_PATH_HOST_LIBS = "${libdir}" deltask generate_qt_config_file do_configure() { + # Regenerate header files when they are included in source tarball + # Otherwise cmake files don't set PRIVATE_HEADERS correctly + rm -rf ${S}/include + mkdir -p ${S}/.git || true + ${S}/configure -v \ -${QT_EDITION} -confirm-license \ -sysroot ${STAGING_DIR_TARGET} \ diff --git a/recipes-qt/qt5/qt5-native.inc b/recipes-qt/qt5/qt5-native.inc index 8535028..7681602 100644 --- a/recipes-qt/qt5/qt5-native.inc +++ b/recipes-qt/qt5/qt5-native.inc @@ -10,10 +10,3 @@ OE_QMAKE_PATH_DOCS = "${OE_QMAKE_PATH_QT_DOCS}" OE_QMAKE_PATH_SETTINGS = "${OE_QMAKE_PATH_QT_SETTINGS}" OE_QMAKE_PATH_EXAMPLES = "${OE_QMAKE_PATH_QT_EXAMPLES}" OE_QMAKE_PATH_TESTS = "${OE_QMAKE_PATH_QT_TESTS}" - -# Regenerate header files when they are included in source tarball -# Otherwise cmake files don't set PRIVATE_HEADERS correctly -do_configure_prepend() { - rm -rf ${S}/include - mkdir -p ${S}/.git || true -} diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 4b5fe8a..95e3854 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -35,13 +35,6 @@ python __anonymous() { d.setVar("PACKAGE_ARCH", tarch) } -# Regenerate header files when they are included in source tarball -# Otherwise cmake files don't set PRIVATE_HEADERS correctly -do_configure_prepend() { - rm -rf ${S}/include - mkdir -p ${S}/.git || true -} - # Many examples come with libraries installed outside of standard libdir, # suppress QA check complaining INSANE_SKIP_${PN}-dbg += "libdir" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 597b45e..7c76c25 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -100,6 +100,11 @@ PACKAGECONFIG_CONFARGS = " \ deltask generate_qt_config_file do_configure_prepend() { + # Regenerate header files when they are included in source tarball + # Otherwise cmake files don't set PRIVATE_HEADERS correctly + rm -rf ${S}/include + mkdir -p ${S}/.git || true + # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory" touch ${S}/mkspecs/oe-device-extra.pri diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index e2784d8..7047f6c 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -167,6 +167,11 @@ XPLATFORM_toolchain-clang = "linux-oe-clang" XPLATFORM ?= "linux-oe-g++" do_configure() { + # Regenerate header files when they are included in source tarball + # Otherwise cmake files don't set PRIVATE_HEADERS correctly + rm -rf ${S}/include + mkdir -p ${S}/.git || true + # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory" during configuration touch ${S}/mkspecs/oe-device-extra.pri