summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2019-10-25 14:33:55 +0300
committerMartin Jansa <Martin.Jansa@gmail.com>2020-01-11 14:59:12 +0100
commit4f701ea1356c003cef8b7b9cad2cd143ddaeecbe (patch)
treefd12fe646a0c1c9cd749cfb55e3f48beec97e559
parent56b2c13d17e63ef89a1bda2e1477007d12ecbd18 (diff)
downloadmeta-qt5-4f701ea1356c003cef8b7b9cad2cd143ddaeecbe.tar.gz
qtbase: add openssl PACKAGECONFIG for native nativesdk
Add PACKAGECONFIG option to enable openssl for qtbase-native and nativesdk-qtbase recipes, since some build tools require openssl to be enabled. Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index bac10639..a102d0c4 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -79,6 +79,7 @@ DEBIAN_NOAUTONAME_${PN} = "1"
79PACKAGECONFIG ?= "" 79PACKAGECONFIG ?= ""
80PACKAGECONFIG[gui] = "-gui -qpa minimal,-no-gui," 80PACKAGECONFIG[gui] = "-gui -qpa minimal,-no-gui,"
81PACKAGECONFIG[imageformats] = "-qt-libpng -qt-libjpeg -gif -ico, -no-libpng -no-libjpeg -no-ico -no-gif," 81PACKAGECONFIG[imageformats] = "-qt-libpng -qt-libjpeg -gif -ico, -no-libpng -no-libjpeg -no-ico -no-gif,"
82PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl"
82 83
83QT_CONFIG_FLAGS += " \ 84QT_CONFIG_FLAGS += " \
84 -shared \ 85 -shared \
@@ -113,7 +114,6 @@ do_configure() {
113 -no-sql-mysql \ 114 -no-sql-mysql \
114 -no-sql-sqlite \ 115 -no-sql-sqlite \
115 -no-opengl \ 116 -no-opengl \
116 -no-openssl \
117 -no-xcb \ 117 -no-xcb \
118 -no-feature-bearermanagement \ 118 -no-feature-bearermanagement \
119 -no-icu \ 119 -no-icu \
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 02d9c455..40c4c72a 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -61,6 +61,7 @@ XPLATFORM ?= "linux-oe-g++"
61PACKAGECONFIG ?= "" 61PACKAGECONFIG ?= ""
62PACKAGECONFIG[gui] = "-gui -qpa minimal,-no-gui," 62PACKAGECONFIG[gui] = "-gui -qpa minimal,-no-gui,"
63PACKAGECONFIG[imageformats] = "-qt-libpng -qt-libjpeg -gif -ico, -no-libpng -no-libjpeg -no-ico -no-gif," 63PACKAGECONFIG[imageformats] = "-qt-libpng -qt-libjpeg -gif -ico, -no-libpng -no-libjpeg -no-ico -no-gif,"
64PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl"
64 65
65QT_CONFIG_FLAGS = " \ 66QT_CONFIG_FLAGS = " \
66 -sysroot ${STAGING_DIR_NATIVE} \ 67 -sysroot ${STAGING_DIR_NATIVE} \
@@ -76,7 +77,6 @@ QT_CONFIG_FLAGS = " \
76 -no-sql-psql \ 77 -no-sql-psql \
77 -no-opengl \ 78 -no-opengl \
78 -no-vulkan \ 79 -no-vulkan \
79 -no-openssl \
80 -no-xcb \ 80 -no-xcb \
81 -no-icu \ 81 -no-icu \
82 -verbose \ 82 -verbose \