diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2019-09-20 14:17:05 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2019-09-23 04:50:59 +0000 |
| commit | 47c12e77b84ed669db37ee0d8520e826d9560b48 (patch) | |
| tree | 483269b245f6baa9a40a7a8f8c98ceedfaf4447f | |
| parent | 3f2b7d68ad929d4e3f3677da6047061d558e15f6 (diff) | |
IFW: Fix build with Linuxv5.14.0-alpha1-packaging
Older Linux distros do not have harfbuzz installed, link the library
statically to Qt. Added also openssl pthread and dl libs otherwise the
openssl static linking will fail with "undefined reference to
'pthread_rwlock_init'" error
Change-Id: Ib7ac9362617f1de150fb2cf4a0438c3302bd91de
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| -rw-r--r-- | packaging-tools/bld_ifw_tools.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/packaging-tools/bld_ifw_tools.py b/packaging-tools/bld_ifw_tools.py index d88b032ef..47de3cb93 100644 --- a/packaging-tools/bld_ifw_tools.py +++ b/packaging-tools/bld_ifw_tools.py @@ -119,7 +119,7 @@ def get_common_qt_configure_options(): if plat.startswith('linux'): options += '-qt-xcb -no-opengl -no-icu -no-libudev ' options += '-qt-pcre -no-glib -no-egl ' - options += '-no-sm ' + options += '-no-sm -qt-harfbuzz ' if bldinstallercommon.is_mac_platform(): options += '-no-freetype ' return options @@ -142,6 +142,9 @@ def get_build_env(openssl_dir): tmp = dict(os.environ) if bldinstallercommon.is_mac_platform() and os.path.isdir(openssl_dir): tmp['OPENSSL_LIBS'] = "-L{0}/lib -lssl -lcrypto".format(openssl_dir) + if bldinstallercommon.is_linux_platform() and os.path.isdir(openssl_dir): + tmp['OPENSSL_LIBS'] = "-I{0}/include -L{0}/lib -ldl -lssl -lcrypto -lpthread".format(openssl_dir) + return tmp |