aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2019-03-28 10:39:06 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2019-04-03 14:10:43 +0000
commita4bf2402c19742b866cf4b5e5e4665ae070500ff (patch)
tree1a4a1ea5498835e0272c449e146fc25addbbbca7
parentadf7f605872f246b692fd9628af26505f6e9c485 (diff)
qtbase-native: add native libdir to search path
After commit 521a85395, Qt uses global search paths to resolve each library path, but because we are using -no-gcc-sysroot the native libdir is not part of the search path. Add the native libdir to search path so that we don't depend on host libraries for locating zlib. Fixes "ERROR: Feature 'system-zlib' was enabled, but the pre-condition 'libs.zlib' failed." Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb1
1 files changed, 1 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 45b8f7b1..835c7081 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -58,6 +58,7 @@ XPLATFORM ?= "linux-oe-g++"
PACKAGECONFIG_CONFARGS = " \
-sysroot ${STAGING_DIR_NATIVE} \
+ -L${STAGING_LIBDIR_NATIVE} \
-no-gcc-sysroot \
-system-zlib \
-qt-pcre \