Skip to contentSkip to conversation

package/qt5/qt5base: build Qt 5.6 with LibreSSL if present.

PATCH New James Grant 2 participants 2 messages Mar 3, 2019 – Mar 4, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 ...rmissive-gcc-flag-to-allow-compilati.patch | 29 +++++++++++++++++++
 package/qt5/qt5base/qt5base.mk                |  4 ++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 package/qt5/qt5base/5.6.3/0003-libressl-add-fpermissive-gcc-flag-to-allow-compilati.patch
package/qt5/qt5base/5.6.3/0003-libressl-add-fpermissive-gcc-flag-to-allow-compilati.patch new file +29 -0
new file mode 100644
index 0000000000..c8fc426f79
@@ -0,0 +1,29 @@
+From 62588f2d8267c67c2337004e83e80695280db9eb Mon Sep 17 00:00:00 2001
+From: James Grant <[email protected]>
+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 <[email protected]>
+---
+ 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
+
package/qt5/qt5base/qt5base.mk +3 -1
index a5ce583327..e7f6e658f1 100644
@@ -190,7 +190,9 @@ endif
 
 ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
 # 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
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl)
 QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_OPENSSL),openssl)
Signature · 1 line
2.18.1
#1 lore raw

PATCH 1/1 package/qt5/qt5base: build Qt 5.6 with LibreSSL if present.

Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"James" == James Grant <[email protected]> writes:

LibreSSL build is successful with shared linkage, but not default dlopen(). Also adds patch for successful compilation by using -fpermissive.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard