d-two/operating-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update buildroot 2018.05.1 / u-boot (#150)

Browse Source 
* Update buildroot 2018.05.1 / u-boot

* Cleanup

* Fix bl
This commit is contained in:
Pascal Vizeli
2018-08-07 16:45:12 +02:00
committed by GitHub
parent bbe4c47574
commit 9ef96373a9
131 changed files with 1320 additions and 656 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
buildroot/package/qt5/qt53d/qt53d.mk
View File

@@ -37,13 +37,19 @@ endef
endif
ifeq ($(BR2_STATIC_LIBS),)
define QT53D_INSTALL_TARGET_CMDS
cp -dpf $(STAGING_DIR)/usr/lib/libQt53D*.so.* $(TARGET_DIR)/usr/lib
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
# Available since 5.9
define QT53D_INSTALL_TARGET_LATEST
cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/geometryloaders $(TARGET_DIR)/usr/lib/qt/plugins
cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/renderplugins $(TARGET_DIR)/usr/lib/qt/plugins
endef
endif
define QT53D_INSTALL_TARGET_CMDS
cp -dpf $(STAGING_DIR)/usr/lib/libQt53D*.so.* $(TARGET_DIR)/usr/lib
cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/sceneparsers $(TARGET_DIR)/usr/lib/qt/plugins
cp -dpfr $(STAGING_DIR)/usr/qml/Qt3D $(TARGET_DIR)/usr/qml
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick $(TARGET_DIR)/usr/qml
$(QT53D_INSTALL_TARGET_LATEST)
$(QT53D_INSTALL_TARGET_EXAMPLES)
endef
endif

2
buildroot/package/qt5/qt5base/qmake.conf.in
View File

@@ -21,7 +21,7 @@ CONFIG += nostrip
QMAKE_LIBS += -lrt -lpthread -ldl
QMAKE_CFLAGS_ISYSTEM =
# Architecturespecific configuration
# Architecture specific configuration
include(arch.conf)
@EGLFS_DEVICE@

1
buildroot/package/qt5/qt5base/qt5base.mk
View File

@@ -269,7 +269,6 @@ define QT5BASE_CONFIGURE_CMDS
sed 's/@EGLFS_DEVICE@/$(QT5BASE_EGLFS_DEVICE)/g' \
$(QT5BASE_PKGDIR)/qmake.conf.in > \
$(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf
$(QT5BASE_CONFIGURE_QMAKE_CONFIG)
$(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qplatformdefs.h \
$(@D)/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h
$(QT5BASE_CONFIGURE_CONFIG_FILE)

2
buildroot/package/qt5/qt5charts/qt5charts.mk
View File

@@ -11,7 +11,9 @@ QT5CHARTS_DEPENDENCIES = qt5base
QT5CHARTS_INSTALL_STAGING = YES
QT5CHARTS_LICENSE = GPL-3.0
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5CHARTS_LICENSE_FILES = LICENSE.GPL3
endif
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
QT5CHARTS_DEPENDENCIES += qt5declarative

49
buildroot/package/qt5/qt5script/0001-Detect-32-bits-armv8-a-architecture.patch Normal file
View File

@@ -0,0 +1,49 @@
From daf2e222903bacf85f27dfb0fffc4459bbf58b77 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@savoirfairelinux.com>
Date: Sun, 10 Jun 2018 08:23:50 -0400
Subject: [PATCH] Detect 32-bits armv8-a architecture
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
These toolchains define __ARM_ARCH_8A__ (for ARM architecture version)
and __arm__ (for 32-bits word-size; __aarch64__ for 64-bits).
This commit catches this new architecture (armv8a) within a #ifdef/#endif
inside the if statement dedicated for 32-bits ARM detection. See commit
from WebKit [1] and [2].
Fixes:
In file included from ../3rdparty/javascriptcore/JavaScriptCore/config.h:26,
from ../3rdparty/javascriptcore/JavaScriptCore/pcre/pcre_compile.cpp:44:
../3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h:370:6: error: #error "Not supported ARM architecture"
# error "Not supported ARM architecture"
^~~~~
[1]: https://github.com/WebKit/webkit/commit/313d9fc4bdd2f020a5d0cf834c3c61982f161ebb
[2]: https://github.com/WebKit/webkit/commit/98f0de0709786f5d9b09dfd5908266990eb909d6
Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
---
src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
index 00caa6d..c4b758e 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
@@ -306,6 +306,10 @@
|| defined(__ARM_ARCH_7R__)
#define WTF_ARM_ARCH_VERSION 7
+#elif defined(__ARM_ARCH_8__) \
+ || defined(__ARM_ARCH_8A__)
+#define WTF_ARM_ARCH_VERSION 8
+
/* RVCT sets _TARGET_ARCH_ARM */
#elif defined(__TARGET_ARCH_ARM)
#define WTF_ARM_ARCH_VERSION __TARGET_ARCH_ARM
--
2.17.1