From 47c12e77b84ed669db37ee0d8520e826d9560b48 Mon Sep 17 00:00:00 2001 From: Katja Marttila Date: Fri, 20 Sep 2019 14:17:05 +0300 Subject: IFW: Fix build with Linux 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 --- packaging-tools/bld_ifw_tools.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3