summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5
diff options
context:
space:
mode:
authorMing Liu <liu.ming50@gmail.com>2018-01-08 06:52:07 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2018-01-15 17:55:20 +0000
commit34a3a4bf4b58ea7e63ff81eaf35963cbd4cf59b5 (patch)
treebb5d34eee52585bbd9ea3833d42f78abe3328b8c /recipes-qt/qt5
parentf5cb85e6293e1f742d77959cd1d7e42d536b259f (diff)
downloadmeta-qt5-34a3a4bf4b58ea7e63ff81eaf35963cbd4cf59b5.tar.gz
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 <liu.ming50@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5')
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb5
-rw-r--r--recipes-qt/qt5/qt5-native.inc7
-rw-r--r--recipes-qt/qt5/qt5.inc7
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb5
-rw-r--r--recipes-qt/qt5/qtbase_git.bb5
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 3aeb2ab1..4f4a0c30 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}"
102deltask generate_qt_config_file 102deltask generate_qt_config_file
103 103
104do_configure() { 104do_configure() {
105 # Regenerate header files when they are included in source tarball
106 # Otherwise cmake files don't set PRIVATE_HEADERS correctly
107 rm -rf ${S}/include
108 mkdir -p ${S}/.git || true
109
105 ${S}/configure -v \ 110 ${S}/configure -v \
106 -${QT_EDITION} -confirm-license \ 111 -${QT_EDITION} -confirm-license \
107 -sysroot ${STAGING_DIR_TARGET} \ 112 -sysroot ${STAGING_DIR_TARGET} \
diff --git a/recipes-qt/qt5/qt5-native.inc b/recipes-qt/qt5/qt5-native.inc
index 85350288..76816027 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}"
10OE_QMAKE_PATH_SETTINGS = "${OE_QMAKE_PATH_QT_SETTINGS}" 10OE_QMAKE_PATH_SETTINGS = "${OE_QMAKE_PATH_QT_SETTINGS}"
11OE_QMAKE_PATH_EXAMPLES = "${OE_QMAKE_PATH_QT_EXAMPLES}" 11OE_QMAKE_PATH_EXAMPLES = "${OE_QMAKE_PATH_QT_EXAMPLES}"
12OE_QMAKE_PATH_TESTS = "${OE_QMAKE_PATH_QT_TESTS}" 12OE_QMAKE_PATH_TESTS = "${OE_QMAKE_PATH_QT_TESTS}"
13
14# Regenerate header files when they are included in source tarball
15# Otherwise cmake files don't set PRIVATE_HEADERS correctly
16do_configure_prepend() {
17 rm -rf ${S}/include
18 mkdir -p ${S}/.git || true
19}
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index 4b5fe8a8..95e3854c 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -35,13 +35,6 @@ python __anonymous() {
35 d.setVar("PACKAGE_ARCH", tarch) 35 d.setVar("PACKAGE_ARCH", tarch)
36} 36}
37 37
38# Regenerate header files when they are included in source tarball
39# Otherwise cmake files don't set PRIVATE_HEADERS correctly
40do_configure_prepend() {
41 rm -rf ${S}/include
42 mkdir -p ${S}/.git || true
43}
44
45# Many examples come with libraries installed outside of standard libdir, 38# Many examples come with libraries installed outside of standard libdir,
46# suppress QA check complaining 39# suppress QA check complaining
47INSANE_SKIP_${PN}-dbg += "libdir" 40INSANE_SKIP_${PN}-dbg += "libdir"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 597b45ed..7c76c255 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -100,6 +100,11 @@ PACKAGECONFIG_CONFARGS = " \
100deltask generate_qt_config_file 100deltask generate_qt_config_file
101 101
102do_configure_prepend() { 102do_configure_prepend() {
103 # Regenerate header files when they are included in source tarball
104 # Otherwise cmake files don't set PRIVATE_HEADERS correctly
105 rm -rf ${S}/include
106 mkdir -p ${S}/.git || true
107
103 # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory" 108 # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory"
104 touch ${S}/mkspecs/oe-device-extra.pri 109 touch ${S}/mkspecs/oe-device-extra.pri
105 110
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index e2784d82..7047f6c1 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"
167XPLATFORM ?= "linux-oe-g++" 167XPLATFORM ?= "linux-oe-g++"
168 168
169do_configure() { 169do_configure() {
170 # Regenerate header files when they are included in source tarball
171 # Otherwise cmake files don't set PRIVATE_HEADERS correctly
172 rm -rf ${S}/include
173 mkdir -p ${S}/.git || true
174
170 # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory" during configuration 175 # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory" during configuration
171 touch ${S}/mkspecs/oe-device-extra.pri 176 touch ${S}/mkspecs/oe-device-extra.pri
172 177