Update Buildroot from 17.02.5 -> 17.02.6
This commit is contained in:
@@ -0,0 +1,29 @@
|
||||
From b8f98d956501dfa4ce03a137f15d404930a56066 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Shachnev <mitya57@gmail.com>
|
||||
Date: Sat, 5 Mar 2016 10:25:33 +0300
|
||||
Subject: [PATCH] alsatest: Fix the check to treat alsalib 1.1.x as correct
|
||||
version
|
||||
|
||||
Task-number: QTBUG-51681
|
||||
Change-Id: I63266c33342f02f4d1a5ea5786f5fbc5a1b421b3
|
||||
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
|
||||
[Upstream commit: https://github.com/qtproject/qtbase/commit/b8f98d956501dfa4ce03a137f15d404930a56066]
|
||||
[Patch fixing ALSA detection. Taken from Qt5, but applies fine to Qt4.]
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
config.tests/unix/alsa/alsatest.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/config.tests/unix/alsa/alsatest.cpp b/config.tests/unix/alsa/alsatest.cpp
|
||||
index cab6533977..0b45819b61 100644
|
||||
--- a/config.tests/unix/alsa/alsatest.cpp
|
||||
+++ b/config.tests/unix/alsa/alsatest.cpp
|
||||
@@ -32,7 +32,7 @@
|
||||
****************************************************************************/
|
||||
|
||||
#include <alsa/asoundlib.h>
|
||||
-#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10))
|
||||
+#if SND_LIB_VERSION < 0x1000a // 1.0.10
|
||||
#error "Alsa version found too old, require >= 1.0.10"
|
||||
#endif
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
From 2281fa50f6e13278d3fd4f028377b8249b7b3cdb Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Fri, 8 Sep 2017 09:06:54 +0200
|
||||
Subject: [PATCH] src/corelib/arch/qatomic_arm.h: fix build on ARMv8 32-bit
|
||||
|
||||
The Qt build fails on ARMv8 32-bit because it falls back to using the
|
||||
ARMv5 code that uses the swp instruction, which no longer exists:
|
||||
|
||||
/tmp/ccSxVIzw.s: Assembler messages:
|
||||
/tmp/ccSxVIzw.s:127: Error: swp{b} use is obsoleted for ARMv8 and later
|
||||
/tmp/ccSxVIzw.s:190: Error: swp{b} use is obsoleted for ARMv8 and later
|
||||
|
||||
So, this commit adjusts the ARM atomic code to assume ARMv8 is similar
|
||||
to ARMv7.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
src/corelib/arch/qatomic_arm.h | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/corelib/arch/qatomic_arm.h b/src/corelib/arch/qatomic_arm.h
|
||||
index 77cd66f272..e011929d3e 100644
|
||||
--- a/src/corelib/arch/qatomic_arm.h
|
||||
+++ b/src/corelib/arch/qatomic_arm.h
|
||||
@@ -47,7 +47,8 @@ QT_BEGIN_HEADER
|
||||
#if defined(__ARM_ARCH_7__) \
|
||||
|| defined(__ARM_ARCH_7A__) \
|
||||
|| defined(__ARM_ARCH_7R__) \
|
||||
- || defined(__ARM_ARCH_7M__)
|
||||
+ || defined(__ARM_ARCH_7M__) \
|
||||
+ || defined(__ARM_ARCH_8A__)
|
||||
# define QT_ARCH_ARMV7
|
||||
QT_BEGIN_INCLUDE_HEADER
|
||||
# include "QtCore/qatomic_armv7.h"
|
||||
--
|
||||
2.13.5
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
# md5 http://download.qt.io/official_releases/qt/4.8/4.8.7/md5sums-4.8.7, sha256 locally computed:
|
||||
md5 d990ee66bf7ab0c785589776f35ba6ad qt-everywhere-opensource-src-4.8.7.tar.gz
|
||||
sha256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 qt-everywhere-opensource-src-4.8.7.tar.gz
|
||||
sha256 e03740e20b8dbf52d163d8a4a37125e7c55b59a9a5e7cf7e89a08e07286b6135 b8f98d956501dfa4ce03a137f15d404930a56066.patch
|
||||
|
||||
@@ -15,9 +15,6 @@ QT_VERSION_MAJOR = 4.8
|
||||
QT_VERSION = $(QT_VERSION_MAJOR).7
|
||||
QT_SOURCE = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
|
||||
QT_SITE = http://download.qt-project.org/official_releases/qt/$(QT_VERSION_MAJOR)/$(QT_VERSION)
|
||||
# Patch fixing ALSA detection. Taken from Qt5, but applies fine to
|
||||
# Qt4.
|
||||
QT_PATCH = https://github.com/qtproject/qtbase/commit/b8f98d956501dfa4ce03a137f15d404930a56066.patch
|
||||
QT_DEPENDENCIES = host-pkgconf
|
||||
QT_INSTALL_STAGING = YES
|
||||
|
||||
|
||||
Reference in New Issue
Block a user