diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2019-01-08 11:05:29 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-03-07 23:54:18 +0000 |
commit | fe88b99ad393fef1b97ed755209dd4161ed7af07 (patch) | |
tree | 91285d498ef900825b02ded84c6ccef59205930e | |
parent | 92c34de4bb11223c059466d3d0690eb763a56102 (diff) | |
download | meta-qt5-fe88b99ad393fef1b97ed755209dd4161ed7af07.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.
Signed-off-by: Samuli Piippo <samuli.piippo@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 987d156f..f4d60bc7 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -81,7 +81,6 @@ QT_CONFIG_FLAGS += " \ | |||
81 | -shared \ | 81 | -shared \ |
82 | -silent \ | 82 | -silent \ |
83 | -no-pch \ | 83 | -no-pch \ |
84 | -no-rpath \ | ||
85 | -pkg-config \ | 84 | -pkg-config \ |
86 | ${PACKAGECONFIG_CONFARGS} \ | 85 | ${PACKAGECONFIG_CONFARGS} \ |
87 | " | 86 | " |
@@ -143,7 +142,6 @@ do_configure() { | |||
143 | -nomake examples \ | 142 | -nomake examples \ |
144 | -nomake tests \ | 143 | -nomake tests \ |
145 | -no-compile-examples \ | 144 | -no-compile-examples \ |
146 | -no-rpath \ | ||
147 | -platform ${OE_QMAKE_PLATFORM_NATIVE} \ | 145 | -platform ${OE_QMAKE_PLATFORM_NATIVE} \ |
148 | -xplatform ${OE_QMAKE_PLATFORM} \ | 146 | -xplatform ${OE_QMAKE_PLATFORM} \ |
149 | ${QT_CONFIG_FLAGS} | 147 | ${QT_CONFIG_FLAGS} |