diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2019-01-08 11:05:29 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-01-08 11:56:08 +0000 |
commit | 700c4543c5d849a438f4fc225ef4c0103a3ddc05 (patch) | |
tree | f43ae702b4fa7d7d810cf7b6cae2aacb75a4be76 | |
parent | 475da47667f65fc83023f2f4553e47cdf41f352c (diff) | |
download | meta-qt5-700c4543c5d849a438f4fc225ef4c0103a3ddc05.tar.gz |
nativesdk-qtbase: use rpath for nativesdk Qt tools
rpath is needed to be able to run qt tools from the sdk without
having the sdk's lib dir explicitly in LD_LIBRARY_PATH or relying
on host libraries. Qt uses relative rpaths, so the build directories
are not used there.
Change-Id: Ie341c2fd5931252e7912119f50720025dfdcaf06
Fixes: AUTOSUITE-734
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 91c6c4d0..ed0f850a 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -75,7 +75,6 @@ QT_CONFIG_FLAGS += " \ | |||
75 | -shared \ | 75 | -shared \ |
76 | -silent \ | 76 | -silent \ |
77 | -no-pch \ | 77 | -no-pch \ |
78 | -no-rpath \ | ||
79 | -pkg-config \ | 78 | -pkg-config \ |
80 | ${PACKAGECONFIG_CONFARGS} \ | 79 | ${PACKAGECONFIG_CONFARGS} \ |
81 | " | 80 | " |
@@ -137,7 +136,6 @@ do_configure() { | |||
137 | -nomake examples \ | 136 | -nomake examples \ |
138 | -nomake tests \ | 137 | -nomake tests \ |
139 | -no-compile-examples \ | 138 | -no-compile-examples \ |
140 | -no-rpath \ | ||
141 | -platform ${OE_QMAKE_PLATFORM_NATIVE} \ | 139 | -platform ${OE_QMAKE_PLATFORM_NATIVE} \ |
142 | -xplatform ${OE_QMAKE_PLATFORM} \ | 140 | -xplatform ${OE_QMAKE_PLATFORM} \ |
143 | ${QT_CONFIG_FLAGS} | 141 | ${QT_CONFIG_FLAGS} |