Buildroot 2019.02.8 (#533)
* Update Buildroot 2019.02.8 * Update patches
This commit is contained in:
@@ -0,0 +1,32 @@
|
||||
From e094806951ff7337b5b0c534db479e3808f153a7 Mon Sep 17 00:00:00 2001
|
||||
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
||||
Date: Tue, 13 Nov 2018 16:00:23 +0100
|
||||
Subject: [PATCH] Fix compile issue with gcc 9
|
||||
|
||||
It appears messenne_twisters in the latest libstdc++ has one more
|
||||
requirement before it is willing to construct with our
|
||||
SystemGenerator struct as an sseq provider.
|
||||
|
||||
Change-Id: If38151d1fa6f40a80274acc26d9ed6b4ac6049fe
|
||||
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
||||
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
||||
Signed-off-by: Julien Beraud <julien.beraud@orolia.com>
|
||||
---
|
||||
src/corelib/global/qrandom.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp
|
||||
index ebf9864b15..577736a867 100644
|
||||
--- a/src/corelib/global/qrandom.cpp
|
||||
+++ b/src/corelib/global/qrandom.cpp
|
||||
@@ -218,6 +218,7 @@ struct QRandomGenerator::SystemGenerator
|
||||
#endif // Q_OS_WINRT
|
||||
|
||||
static SystemGenerator &self();
|
||||
+ typedef quint32 result_type;
|
||||
void generate(quint32 *begin, quint32 *end) Q_DECL_NOEXCEPT_EXPR(FillBufferNoexcept);
|
||||
|
||||
// For std::mersenne_twister_engine implementations that use something
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
|
||||
Date: Mon, 23 Nov 2015 03:54:00 +0000
|
||||
Subject: [PATCH 1/1] When UChar is defined as char16_t in ICU, then qtbase fails to detect ICU.
|
||||
|
||||
Build fails with following error:
|
||||
|
||||
ICU auto-detection... ()
|
||||
x86_64-pc-linux-gnu-g++ -c -march=core2 -O2 -fno-ident \
|
||||
-frecord-gcc-switches -pipe -Wall -O2 -Wall -W -fPIC -I. \
|
||||
-I/var/tmp/portage/dev-qt/qtcore-5.5.1/work/qtbase-opensource-src-5.5.1/mkspecs/linux-g++ -o icu.o icu.cpp
|
||||
In file included from /usr/include/unicode/utypes.h:36:0,
|
||||
from icu.cpp:34:
|
||||
/usr/include/unicode/umachine.h:306:13: error: 'char16_t' does not name a type
|
||||
typedef char16_t UChar;
|
||||
^
|
||||
In file included from /usr/include/unicode/utypes.h:37:0,
|
||||
from icu.cpp:34:
|
||||
/usr/include/unicode/uversion.h:165:55: error: 'UChar' does not name a type
|
||||
u_versionFromUString(UVersionInfo versionArray, const UChar *versionString);
|
||||
^
|
||||
...
|
||||
Makefile:177: recipe for target 'icu.o' failed
|
||||
gmake: *** [icu.o] Error 1
|
||||
ICU disabled.
|
||||
The ICU library support cannot be enabled.
|
||||
|
||||
This change isn't needed for new Qt versions, because c++11 is mandatory since 5.7.
|
||||
Upstream desided not to merge this change into old branches, like 5.6.
|
||||
Original patch was slightly modified to apply cleanly on Qt 5.6.3.
|
||||
|
||||
Fetch from: https://bugreports.qt.io/secure/attachment/52478/qtbase-5.5.1-icu.patch
|
||||
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
|
||||
Signed-off-by: Andrey Skvortsov <andrej.skvortzov@gmail.com>
|
||||
|
||||
---
|
||||
diff -purN qt5base-5.6.3.orig/config.tests/unix/compile.test qt5base-5.6.3/config.tests/unix/compile.test
|
||||
--- qt5base-5.6.3.orig/config.tests/unix/compile.test 2019-08-11 00:35:33.181545706 +0300
|
||||
+++ qt5base-5.6.3/config.tests/unix/compile.test 2017-09-06 15:13:54.000000000 +0300
|
||||
@@ -47,7 +47,7 @@ while [ "$#" -gt 0 ]; do
|
||||
INC=`echo $PARAM | sed -e 's/^-I//'`
|
||||
INCLUDEPATH="$INCLUDEPATH \"$INC\""
|
||||
;;
|
||||
- -f*|-D*)
|
||||
+ -f*|-D*|-std=*)
|
||||
CFLAGS="$CFLAGS \"$PARAM\""
|
||||
CXXFLAGS="$CXXFLAGS \"$PARAM\""
|
||||
;;
|
||||
diff -purN qt5base-5.6.3.orig/configure qt5base-5.6.3/configure
|
||||
--- qt5base-5.6.3.orig/configure 2019-08-11 00:57:45.488214036 +0300
|
||||
+++ qt5base-5.6.3/configure 2017-09-06 15:13:54.000000000 +0300
|
||||
@@ -5183,8 +5183,10 @@ fi
|
||||
|
||||
# auto-detect libicu support
|
||||
if [ "$CFG_ICU" != "no" ]; then
|
||||
- if compileTest unix/icu "ICU"; then
|
||||
+ QT_CXXFLAGS_ICU=`icu-config --cxxflags 2>/dev/null`
|
||||
+ if compileTest unix/icu "ICU" $QT_CXXFLAGS_ICU; then
|
||||
[ "$CFG_ICU" = "auto" ] && CFG_ICU=yes
|
||||
+ QMakeVar set QT_CXXFLAGS_ICU "$QT_CXXFLAGS_ICU"
|
||||
else
|
||||
if [ "$CFG_ICU" = "auto" ]; then
|
||||
CFG_ICU=no
|
||||
diff -purN qt5base-5.6.3.orig/doc/Makefile qt5base-5.6.3/doc/Makefile
|
||||
diff -purN qt5base-5.6.3.orig/src/corelib/tools/tools.pri qt5base-5.6.3/src/corelib/tools/tools.pri
|
||||
--- qt5base-5.6.3.orig/src/corelib/tools/tools.pri 2019-08-11 00:45:45.073818635 +0300
|
||||
+++ qt5base-5.6.3/src/corelib/tools/tools.pri 2017-09-06 15:13:54.000000000 +0300
|
||||
@@ -169,6 +169,7 @@ contains(QT_CONFIG,icu) {
|
||||
tools/qcollator_icu.cpp \
|
||||
tools/qtimezoneprivate_icu.cpp
|
||||
DEFINES += QT_USE_ICU
|
||||
+ QMAKE_CXXFLAGS += $$QT_CXXFLAGS_ICU
|
||||
} else: win32 {
|
||||
SOURCES += tools/qcollator_win.cpp
|
||||
} else: macx {
|
||||
@@ -15,7 +15,10 @@ QMAKE_CXX = $${CROSS_COMPILE}g++
|
||||
# modifications to gcc-base.conf
|
||||
QMAKE_CFLAGS += $${BR_COMPILER_CFLAGS}
|
||||
QMAKE_CXXFLAGS += $${BR_COMPILER_CXXFLAGS}
|
||||
QMAKE_CXXFLAGS_RELEASE += -O3
|
||||
QMAKE_CFLAGS_OPTIMIZE =
|
||||
QMAKE_CFLAGS_OPTIMIZE_DEBUG =
|
||||
QMAKE_CFLAGS_OPTIMIZE_FULL =
|
||||
QMAKE_CFLAGS_OPTIMIZE_SIZE =
|
||||
CONFIG += nostrip
|
||||
|
||||
QMAKE_LIBS += -lrt -lpthread -ldl
|
||||
|
||||
@@ -27,6 +27,13 @@ QT5BASE_CONFIGURE_OPTS += \
|
||||
-no-pch \
|
||||
-shared
|
||||
|
||||
# starting from version 5.9.0, -optimize-debug is enabled by default
|
||||
# for debug builds and it overrides -O* with -Og which is not what we
|
||||
# want.
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
|
||||
QT5BASE_CONFIGURE_OPTS += -no-optimize-debug
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
|
||||
QT5BASE_DEPENDENCIES += pcre
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user