summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2019-10-25 14:33:55 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2019-10-28 18:54:13 +0200
commit6fca0e337ba1b8deaac9b6c0fa41a485e5bf5013 (patch)
treec46108c7618b5dd6a37d8e43eaf1a1172ce959b3
parent09f4a09bd2cdb5631dab707c38fdcc746e339ce7 (diff)
downloadmeta-qt5-6fca0e337ba1b8deaac9b6c0fa41a485e5bf5013.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. Change-Id: Ic213e70b3983f99245e6ea7668eb48369ac5e61d Reviewed-by: Mikko Gronoff <mikko.gronoff@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 74672bf3..e3d4c3b4 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -77,6 +77,7 @@ DEBIAN_NOAUTONAME_${PN} = "1"
77PACKAGECONFIG ?= "" 77PACKAGECONFIG ?= ""
78PACKAGECONFIG[gui] = "-gui -qpa offscreen,-no-gui," 78PACKAGECONFIG[gui] = "-gui -qpa offscreen,-no-gui,"
79PACKAGECONFIG[imageformats] = "-qt-libpng -qt-libjpeg -gif -ico, -no-libpng -no-libjpeg -no-ico -no-gif," 79PACKAGECONFIG[imageformats] = "-qt-libpng -qt-libjpeg -gif -ico, -no-libpng -no-libjpeg -no-ico -no-gif,"
80PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl"
80 81
81QT_CONFIG_FLAGS += " \ 82QT_CONFIG_FLAGS += " \
82 -shared \ 83 -shared \
@@ -111,7 +112,6 @@ do_configure() {
111 -no-sql-mysql \ 112 -no-sql-mysql \
112 -no-sql-sqlite \ 113 -no-sql-sqlite \
113 -no-opengl \ 114 -no-opengl \
114 -no-openssl \
115 -no-xcb \ 115 -no-xcb \
116 -no-feature-bearermanagement \ 116 -no-feature-bearermanagement \
117 -no-icu \ 117 -no-icu \
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index a144689f..8bcea45c 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -59,6 +59,7 @@ XPLATFORM ?= "linux-oe-g++"
59PACKAGECONFIG ?= "" 59PACKAGECONFIG ?= ""
60PACKAGECONFIG[gui] = "-gui -qpa offscreen,-no-gui," 60PACKAGECONFIG[gui] = "-gui -qpa offscreen,-no-gui,"
61PACKAGECONFIG[imageformats] = "-qt-libpng -qt-libjpeg -gif -ico, -no-libpng -no-libjpeg -no-ico -no-gif," 61PACKAGECONFIG[imageformats] = "-qt-libpng -qt-libjpeg -gif -ico, -no-libpng -no-libjpeg -no-ico -no-gif,"
62PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl"
62 63
63QT_CONFIG_FLAGS = " \ 64QT_CONFIG_FLAGS = " \
64 -sysroot ${STAGING_DIR_NATIVE} \ 65 -sysroot ${STAGING_DIR_NATIVE} \
@@ -74,7 +75,6 @@ QT_CONFIG_FLAGS = " \
74 -no-sql-psql \ 75 -no-sql-psql \
75 -no-opengl \ 76 -no-opengl \
76 -no-vulkan \ 77 -no-vulkan \
77 -no-openssl \
78 -no-xcb \ 78 -no-xcb \
79 -no-icu \ 79 -no-icu \
80 -verbose \ 80 -verbose \