summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2019-04-17 19:17:35 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2019-04-17 23:34:33 +0000
commit4303873091a860ce3f6dd8299f36ae7675ad716f (patch)
treeea7109d86d40ede4e1c5562d01927e6a0e705b52
parent8895ea3b63c7ab959794acef93548c1c9df9307e (diff)
downloadmeta-qt5-4303873091a860ce3f6dd8299f36ae7675ad716f.tar.gz
qtbase-native: use QT_CONFIG_FLAGS variable like qtbase and nativesdk-qtbase
* instead of using PACKAGECONFIG_CONFARGS directly Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb5
1 files changed, 3 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index f392f889..494301c7 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -56,7 +56,7 @@ CLEANBROKEN = "1"
56XPLATFORM_toolchain-clang = "linux-oe-clang" 56XPLATFORM_toolchain-clang = "linux-oe-clang"
57XPLATFORM ?= "linux-oe-g++" 57XPLATFORM ?= "linux-oe-g++"
58 58
59PACKAGECONFIG_CONFARGS = " \ 59QT_CONFIG_FLAGS = " \
60 -sysroot ${STAGING_DIR_NATIVE} \ 60 -sysroot ${STAGING_DIR_NATIVE} \
61 -L${STAGING_LIBDIR_NATIVE} \ 61 -L${STAGING_LIBDIR_NATIVE} \
62 -no-gcc-sysroot \ 62 -no-gcc-sysroot \
@@ -97,6 +97,7 @@ PACKAGECONFIG_CONFARGS = " \
97 -no-rpath \ 97 -no-rpath \
98 -no-feature-linkat \ 98 -no-feature-linkat \
99 -platform ${XPLATFORM} \ 99 -platform ${XPLATFORM} \
100 ${PACKAGECONFIG_CONFARGS} \
100" 101"
101 102
102# for qtbase configuration we need default settings 103# for qtbase configuration we need default settings
@@ -112,7 +113,7 @@ do_configure_prepend() {
112 # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory" 113 # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory"
113 touch ${S}/mkspecs/oe-device-extra.pri 114 touch ${S}/mkspecs/oe-device-extra.pri
114 115
115 MAKEFLAGS="${PARALLEL_MAKE}" ${S}/configure -${QT_EDITION} -confirm-license ${PACKAGECONFIG_CONFARGS} || die "Configuring qt failed. PACKAGECONFIG_CONFARGS was ${PACKAGECONFIG_CONFARGS}" 116 MAKEFLAGS="${PARALLEL_MAKE}" ${S}/configure -${QT_EDITION} -confirm-license ${QT_CONFIG_FLAGS} || die "Configuring qt failed. QT_CONFIG_FLAGS was ${QT_CONFIG_FLAGS}"
116} 117}
117 118
118do_install() { 119do_install() {