initial buildroot for linux 5.15
This commit is contained in:
Huan.Feng
@@ -0,0 +1,47 @@
|
||||
From dfa9555010535003eac69788597f53d3ff44168f Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Thu, 29 Nov 2018 23:33:10 +0100
|
||||
Subject: [PATCH] qsgtexture: fix debug build with uclibc
|
||||
|
||||
Debug build of gsgtexture fails on uclibc since version 5.11 and
|
||||
https://github.com/qt/qtdeclarative/commit/7c507eaac3f848f92f2ebdafe8ded4a064d68351:
|
||||
|
||||
scenegraph/util/qsgtexture.cpp:69:22: fatal error: execinfo.h: No such file or directory
|
||||
#include <execinfo.h>
|
||||
|
||||
Indeed, !defined(__UCLIBC__) has been replaced by defined(__GBLIBC__) to
|
||||
fix build on musl but as a result, build fails on uclibc because uclibc
|
||||
also defines __GLIBC__ (and it does not have execinfo like musl)
|
||||
|
||||
This error is raised only when building in debug mode because
|
||||
CAN_BACKTRACE_EXECINFO is undefined if QT_NO_DEBUG is set
|
||||
|
||||
So keep defined(__GLIBC__), but put back !defined(__UCLIBC__)
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/6fce0ce5aea943e097532efbbc8d1e28f41e5866
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/qt/qtdeclarative/pull/4]
|
||||
[Rebased for Qt5.14.0]
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
src/quick/scenegraph/coreapi/qsgtexture.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/quick/scenegraph/coreapi/qsgtexture.cpp b/src/quick/scenegraph/coreapi/qsgtexture.cpp
|
||||
index dfbe4d3f..6a7bc79b 100644
|
||||
--- a/src/quick/scenegraph/coreapi/qsgtexture.cpp
|
||||
+++ b/src/quick/scenegraph/coreapi/qsgtexture.cpp
|
||||
@@ -46,7 +46,7 @@
|
||||
#include <private/qsgmaterialshader_p.h>
|
||||
#include <QtGui/private/qrhi_p.h>
|
||||
|
||||
-#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) && defined(__GLIBC__)
|
||||
+#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) && defined(__GLIBC__) && !defined(__UCLIBC__)
|
||||
#define CAN_BACKTRACE_EXECINFO
|
||||
#endif
|
||||
|
||||
--
|
||||
2.23.0
|
||||
|
||||
+41
@@ -0,0 +1,41 @@
|
||||
From bfd3d907f48aba870be00cd251f0b63d34985be2 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Seiderer <ps.report@gmx.net>
|
||||
Date: Thu, 22 Jul 2021 23:02:29 +0200
|
||||
Subject: [PATCH] qv4regexp_p: needs c++ limits include (instead of plain c
|
||||
limit.h)
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Fixes gcc-11 compile:
|
||||
|
||||
In file included from jsruntime/qv4regexp_p.h:62,
|
||||
from jsruntime/qv4regexp.cpp:40:
|
||||
../3rdparty/masm/yarr/Yarr.h:46:44: error: ‘numeric_limits’ is not a member of ‘std’
|
||||
46 | static const unsigned offsetNoMatch = std::numeric_limits<unsigned>::max();
|
||||
| ^~~~~~~~~~~~~~
|
||||
../3rdparty/masm/yarr/Yarr.h:46:59: error: expected primary-expression before ‘unsigned’
|
||||
46 | static const unsigned offsetNoMatch = std::numeric_limits<unsigned>::max();
|
||||
| ^~~~~~~~
|
||||
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
src/qml/jsruntime/qv4regexp_p.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/qml/jsruntime/qv4regexp_p.h b/src/qml/jsruntime/qv4regexp_p.h
|
||||
index 6afb10ea95..c64f3d3c38 100644
|
||||
--- a/src/qml/jsruntime/qv4regexp_p.h
|
||||
+++ b/src/qml/jsruntime/qv4regexp_p.h
|
||||
@@ -57,7 +57,7 @@
|
||||
#include <wtf/FastAllocBase.h>
|
||||
#include <wtf/BumpPointerAllocator.h>
|
||||
|
||||
-#include <limits.h>
|
||||
+#include <limits>
|
||||
|
||||
#include <yarr/Yarr.h>
|
||||
#include <yarr/YarrInterpreter.h>
|
||||
--
|
||||
2.32.0
|
||||
|
||||
+45
@@ -0,0 +1,45 @@
|
||||
From cc8d62f556c065d28a52e4b784b5d22f2cca3001 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Seiderer <ps.report@gmx.net>
|
||||
Date: Thu, 22 Jul 2021 23:13:43 +0200
|
||||
Subject: [PATCH] qqmlprofilerevent_p: needs c++ limits inlcude (fixes gcc-11
|
||||
compile)
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Fixes:
|
||||
|
||||
In file included from qqmlprofilertypedevent_p.h:43,
|
||||
from qqmlprofilertypedevent.cpp:40:
|
||||
qqmlprofilerevent_p.h: In member function ‘void QQmlProfilerEvent::assignNumbers(const Container&)’:
|
||||
qqmlprofilerevent_p.h:314:65: error: ‘numeric_limits’ is not a member of ‘std’
|
||||
314 | static_cast<quint16>(numbers.size()) : std::numeric_limits<quint16>::max();
|
||||
| ^~~~~~~~~~~~~~
|
||||
qqmlprofilerevent_p.h:314:87: error: expected primary-expression before ‘>’ token
|
||||
314 | static_cast<quint16>(numbers.size()) : std::numeric_limits<quint16>::max();
|
||||
| ^
|
||||
qqmlprofilerevent_p.h:314:90: error: ‘::max’ has not been declared; did you mean ‘std::max’?
|
||||
314 | static_cast<quint16>(numbers.size()) : std::numeric_limits<quint16>::max();
|
||||
| ^~~
|
||||
| std::max
|
||||
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
src/qmldebug/qqmlprofilerevent_p.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h
|
||||
index a7e37d1964..01b2f58f16 100644
|
||||
--- a/src/qmldebug/qqmlprofilerevent_p.h
|
||||
+++ b/src/qmldebug/qqmlprofilerevent_p.h
|
||||
@@ -48,6 +48,7 @@
|
||||
#include <QtCore/qmetatype.h>
|
||||
|
||||
#include <initializer_list>
|
||||
+#include <limits>
|
||||
#include <type_traits>
|
||||
|
||||
//
|
||||
--
|
||||
2.32.0
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
config BR2_PACKAGE_QT5DECLARATIVE
|
||||
bool "qt5declarative"
|
||||
depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
|
||||
select BR2_PACKAGE_QT5BASE_GUI
|
||||
help
|
||||
Qt is a cross-platform application and UI framework for
|
||||
developers using C++.
|
||||
|
||||
Qt Declarative module provides the Qt QML and Qt Quick
|
||||
modules for developing UIs with the QML language
|
||||
|
||||
http://doc.qt.io/qt-5/qtqml-index.html
|
||||
http://doc.qt.io/qt-5/qtquick-index.html
|
||||
|
||||
if BR2_PACKAGE_QT5DECLARATIVE
|
||||
|
||||
config BR2_PACKAGE_QT5DECLARATIVE_QUICK
|
||||
bool "quick module"
|
||||
select BR2_PACKAGE_QT5BASE_OPENGL if BR2_PACKAGE_QT5_GL_AVAILABLE
|
||||
|
||||
endif
|
||||
@@ -0,0 +1,9 @@
|
||||
# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz.sha256
|
||||
sha256 c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651 qtdeclarative-everywhere-src-5.15.2.tar.xz
|
||||
|
||||
# Hashes for license files:
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
|
||||
sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
|
||||
sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
|
||||
sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
|
||||
@@ -0,0 +1,15 @@
|
||||
################################################################################
|
||||
#
|
||||
# qt5declarative
|
||||
#
|
||||
################################################################################
|
||||
|
||||
QT5DECLARATIVE_VERSION = $(QT5_VERSION)
|
||||
QT5DECLARATIVE_SITE = $(QT5_SITE)
|
||||
QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5DECLARATIVE_VERSION).tar.xz
|
||||
QT5DECLARATIVE_INSTALL_STAGING = YES
|
||||
|
||||
QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
|
||||
QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
|
||||
|
||||
$(eval $(qmake-package))
|
||||
Reference in New Issue
Block a user