qt4: disable openssl support
PATCH 1/1 qt4: disable openssl support
Qt4 does not support openssl 1.1 (and likely never will), while its oe-core dependencies are being moved to that version, which is causing a sysroot conflict between openssl 1.0 and 1.1 headers. The only way to resolve it is to disable openssl support in Qt4, as we don't want Qt4's outdated version requirements for openssl to be imposed on the rest of oe-core.
Signed-off-by Alexander Kanavin <[email protected]>
--- recipes-qt4/qt4/qt4.inc | 3 ++- recipes-qt4/recipes-python/python-pyqt_4.11.3.bb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
recipes-qt4/qt4/qt4.inc +2 -1
@@ -1,6 +1,6 @@ inherit qmake_base -DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 sqlite3 tiff icu" +DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus glib-2.0 sqlite3 tiff icu" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" require qt4_arch.inc
@@ -25,6 +25,7 @@ QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \ -system-libjpeg -system-libpng -system-libtiff -system-zlib \ -no-pch -stl -glib -icu \ -no-rpath -silent \ + -no-openssl \ -D USE_QTMULTIMEDIA=1 \ ${QT_DBUS} \ ${QT_QT3SUPPORT} \
recipes-qt4/recipes-python/python-pyqt_4.11.3.bb +1 -1
@@ -26,7 +26,7 @@ inherit qmake2 pythonnative python-dir distro_features_check # depends on qt4-x11-free REQUIRED_DISTRO_FEATURES = "x11" -DISABLED_FEATURES = "PyQt_Desktop_OpenGL PyQt_Accessibility PyQt_SessionManager" +DISABLED_FEATURES = "PyQt_Desktop_OpenGL PyQt_Accessibility PyQt_SessionManager PyQt_OpenSSL" DISABLED_FEATURES_append_arm = " PyQt_qreal_double"
Signature · 1 line
2.11.0