Bump buildroot to 2019.02
This commit is contained in:
@@ -0,0 +1,37 @@
|
||||
From d69bd3fd52502c7eb2799397fea14afe350e2cbf Mon Sep 17 00:00:00 2001
|
||||
From: Yuqing Zhu <carol.zhu@nxp.com>
|
||||
Date: Mon, 27 Mar 2017 15:33:35 +0800
|
||||
Subject: [PATCH] qtbase: Fix build error when using EGL
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=utf-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
A build error was occurring due to missing EGL configuration.
|
||||
|
||||
Fixed by adding the necessary ties to the EGL pkg-config.
|
||||
|
||||
Task-number: QTBUG-61712
|
||||
Change-Id: I87190ea39392b4604c563cf9d89edb85068d85fc
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
|
||||
---
|
||||
mkspecs/features/egl.prf | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/mkspecs/features/egl.prf b/mkspecs/features/egl.prf
|
||||
index 9fa0c9e219..85d5852ba6 100644
|
||||
--- a/mkspecs/features/egl.prf
|
||||
+++ b/mkspecs/features/egl.prf
|
||||
@@ -1,3 +1,9 @@
|
||||
+# egl headers need a definition
|
||||
+PKG_CONFIG = $$pkgConfigExecutable()
|
||||
+PKGCONFIG_CFLAGS = $$system($$PKG_CONFIG --cflags egl)
|
||||
+PKGCONFIG_CFLAGS = $$find(PKGCONFIG_CFLAGS, ^-D.*)
|
||||
+QMAKE_CFLAGS_EGL = $$PKGCONFIG_CFLAGS
|
||||
+
|
||||
INCLUDEPATH += $$QMAKE_INCDIR_EGL
|
||||
LIBS_PRIVATE += $$QMAKE_LIBS_EGL
|
||||
QMAKE_CFLAGS += $$QMAKE_CFLAGS_EGL
|
||||
--
|
||||
2.16.1
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtbase-opensource-src-5.6.3.tar.xz.mirrorlist
|
||||
sha256 fef48529a6fc2617a30d75d952cb327c6be341fd104154993922184b3b3b4da1 qtbase-opensource-src-5.6.3.tar.xz
|
||||
|
||||
# Hashes for license files:
|
||||
sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
|
||||
sha256 66f6bb53f6d985a4d651bf1ecfe8bbcbe32b0f744708d588f047580ee85d8ec8 LICENSE.LGPLv21
|
||||
|
||||
Reference in New Issue
Block a user