aboutsummaryrefslogtreecommitdiffstats
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)
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"
XPLATFORM_toolchain-clang = "linux-oe-clang"
XPLATFORM ?= "linux-oe-g++"
-PACKAGECONFIG_CONFARGS = " \
+QT_CONFIG_FLAGS = " \
-sysroot ${STAGING_DIR_NATIVE} \
-L${STAGING_LIBDIR_NATIVE} \
-no-gcc-sysroot \
@@ -97,6 +97,7 @@ PACKAGECONFIG_CONFARGS = " \
-no-rpath \
-no-feature-linkat \
-platform ${XPLATFORM} \
+ ${PACKAGECONFIG_CONFARGS} \
"
# for qtbase configuration we need default settings
@@ -112,7 +113,7 @@ do_configure_prepend() {
# 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
- MAKEFLAGS="${PARALLEL_MAKE}" ${S}/configure -${QT_EDITION} -confirm-license ${PACKAGECONFIG_CONFARGS} || die "Configuring qt failed. PACKAGECONFIG_CONFARGS was ${PACKAGECONFIG_CONFARGS}"
+ MAKEFLAGS="${PARALLEL_MAKE}" ${S}/configure -${QT_EDITION} -confirm-license ${QT_CONFIG_FLAGS} || die "Configuring qt failed. QT_CONFIG_FLAGS was ${QT_CONFIG_FLAGS}"
}
do_install() {