diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-01-05 09:31:02 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-01-14 11:18:23 +0100 |
commit | 4a0acfa4111600b7cb5ae7b16cd6bfa5df2e2123 (patch) | |
tree | 9c51ce517b38b3ae459fbf975bd3181abcffe978 /recipes-qt/qt5/qtbase_git.bb | |
parent | 3bd297278dff1ae12d1241dc21e1e2643d7ccee2 (diff) | |
download | meta-qt5-4a0acfa4111600b7cb5ae7b16cd6bfa5df2e2123.tar.gz |
qtbase: use PACKAGECONFIG to ensure runtime dependency to libssl
Using openssl-linked configure has side effect that gdb catches the SIGILL
signal, which openssl uses internally on ARM, every time when starting
debugging any Qt application. This is annoying and somewhat confusing
behavior even with QtCreator.
Using the default openssl configure argument prevents this, while using
the 4th argument for PACKAGECONFIG keeps the runtime dependency to libssl
correctly in place.
Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 8f519fa7..8b6f509d 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -121,8 +121,7 @@ PACKAGECONFIG[kms] = "-kms,-no-kms,virtual/mesa virtual/egl" | |||
121 | # needed for qtwebkit | 121 | # needed for qtwebkit |
122 | PACKAGECONFIG[icu] = "-icu,-no-icu,icu" | 122 | PACKAGECONFIG[icu] = "-icu,-no-icu,icu" |
123 | PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev" | 123 | PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev" |
124 | # use -openssl-linked here to ensure that RDEPENDS for libcrypto and libssl are detected | 124 | PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" |
125 | PACKAGECONFIG[openssl] = "-openssl-linked,-no-openssl,openssl" | ||
126 | PACKAGECONFIG[alsa] = "-alsa,-no-alsa,alsa-lib" | 125 | PACKAGECONFIG[alsa] = "-alsa,-no-alsa,alsa-lib" |
127 | PACKAGECONFIG[pulseaudio] = "-pulseaudio,-no-pulseaudio,pulseaudio" | 126 | PACKAGECONFIG[pulseaudio] = "-pulseaudio,-no-pulseaudio,pulseaudio" |
128 | PACKAGECONFIG[nis] = "-nis,-no-nis" | 127 | PACKAGECONFIG[nis] = "-nis,-no-nis" |