aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2019-03-28 10:39:06 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2019-03-29 08:45:00 +0000
commite413185212c68e0c3d895c0d7aff508ef297f848 (patch)
treeb4719c7913541abe3fab7964317233da782d8892
parent9a616791b9dc6bdeb1939c8bdb1accad5b99fa2f (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." Change-Id: I25ec41ee26e7c9406ba0107a766258532b1c8d90 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-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 b1243fbb..e6c6a462 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 \