mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-25 20:26:34 +00:00
package/qt5/qt5base: build Qt 5.6 with LibreSSL if present
LibreSSL build is successful with shared linkage, but not default dlopen(). Also adds patch for successful compilation by using -fpermissive. Signed-off-by: James Grant <jamesg@zaltys.org> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
parent
b20f8a893f
commit
a55aca6a3d
@ -0,0 +1,29 @@
|
|||||||
|
From 62588f2d8267c67c2337004e83e80695280db9eb Mon Sep 17 00:00:00 2001
|
||||||
|
From: James Grant <jamesg@zaltys.org>
|
||||||
|
Date: Sun, 3 Mar 2019 17:29:29 +1300
|
||||||
|
Subject: [PATCH 1/1] libressl - add -fpermissive gcc flag to allow
|
||||||
|
compilation.
|
||||||
|
|
||||||
|
Workaround for 'const BIO_METHOD *' vs. 'BIO_METHOD *' changes to BIO_new() and BIO_s_mem() function signatures.
|
||||||
|
|
||||||
|
Signed-off-by: James Grant <jamesg@zaltys.org>
|
||||||
|
---
|
||||||
|
src/network/ssl/ssl.pri | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri
|
||||||
|
index 29c47cd7..f0aad448 100644
|
||||||
|
--- a/src/network/ssl/ssl.pri
|
||||||
|
+++ b/src/network/ssl/ssl.pri
|
||||||
|
@@ -77,7 +77,7 @@ android:!android-no-sdk: SOURCES += ssl/qsslsocket_openssl_android.cpp
|
||||||
|
LIBS_PRIVATE += $$OPENSSL_LIBS_RELEASE
|
||||||
|
}
|
||||||
|
|
||||||
|
- QMAKE_CXXFLAGS += $$OPENSSL_CFLAGS
|
||||||
|
+ QMAKE_CXXFLAGS += $$OPENSSL_CFLAGS -fpermissive
|
||||||
|
LIBS_PRIVATE += $$OPENSSL_LIBS
|
||||||
|
win32: LIBS_PRIVATE += -lcrypt32
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.18.1
|
||||||
|
|
@ -190,7 +190,9 @@ endif
|
|||||||
|
|
||||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
|
ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
|
||||||
# No OpenSSL 1.1.x support in Qt 5.6.x
|
# No OpenSSL 1.1.x support in Qt 5.6.x
|
||||||
QT5BASE_CONFIGURE_OPTS += -no-openssl
|
# LibreSSL works with shared linkage only and -fpermissive patch
|
||||||
|
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_LIBRESSL),-openssl-linked,-no-openssl)
|
||||||
|
QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBRESSL),openssl)
|
||||||
else
|
else
|
||||||
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl)
|
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl)
|
||||||
QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_OPENSSL),openssl)
|
QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_OPENSSL),openssl)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user