Update buidlroot to version 2016.08.1
This commit is contained in:
@@ -0,0 +1,36 @@
|
||||
From 1735a8484ef9ae336f8d607b56bda64c8af10c79 Mon Sep 17 00:00:00 2001
|
||||
From: Trevor Woerner <trevor.woerner@linaro.org>
|
||||
Date: Fri, 7 Feb 2014 04:07:17 +0100
|
||||
Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH)
|
||||
|
||||
Building qtwebkit causes a QA issue such that QtWebPluginProcess and
|
||||
QtWebProcess contain bad RPATHs which point into the build location. This fix
|
||||
adds a patch to not include the rpath.prf which causes this problem.
|
||||
|
||||
Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org>
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
|
||||
Downloaded from:
|
||||
https://github.com/meta-qt5/meta-qt5/blob/krogoth/recipes-qt/qt5/qtwebkit/
|
||||
0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
|
||||
|
||||
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
|
||||
---
|
||||
Tools/qmake/mkspecs/features/unix/default_post.prf | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf
|
||||
index fd66af6..ef754c3 100644
|
||||
--- a/Tools/qmake/mkspecs/features/unix/default_post.prf
|
||||
+++ b/Tools/qmake/mkspecs/features/unix/default_post.prf
|
||||
@@ -61,7 +61,6 @@ linux-*g++* {
|
||||
}
|
||||
}
|
||||
|
||||
-contains(TEMPLATE, app): CONFIG += rpath
|
||||
|
||||
CONFIG(debug, debug|release)|force_debug_info {
|
||||
# Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase.
|
||||
--
|
||||
2.7.0
|
||||
|
||||
@@ -0,0 +1,85 @@
|
||||
From ae16ce17cc7060274a0b0c165b953fc32540f977 Mon Sep 17 00:00:00 2001
|
||||
From: Magnus Granberg <zorry@gentoo.org>
|
||||
Date: Fri, 27 Feb 2015 11:55:09 +0100
|
||||
Subject: [PATCH] Remove TEXTREL tag in x86
|
||||
|
||||
Fix textrel QA warnings when building qtwebkit for x86:
|
||||
|
||||
WARNING: QA Issue: ELF binary '/home/andre/rdk/rdk-master/build-vbox32/tmp/work/core2-32-rdk-linux/qtwebkit/5.4.0-r0/packages-split/qtwebkit/usr/lib/libQt5WebKit.so.5.4.0' has relocations in .text [textrel]
|
||||
|
||||
Patch from upstream webkit:
|
||||
|
||||
https://bugs.webkit.org/show_bug.cgi?id=70610
|
||||
|
||||
Minor refresh required to apply cleanly to the older webkit sources used
|
||||
by qtwebkit. Specifically, the patch needed to be modified to account
|
||||
for PLATFORM(MAC) -> OS(DARWIN) renaming in recent webkit which is not
|
||||
part of qtwebkit yet ( https://bugs.webkit.org/show_bug.cgi?id=99683 ).
|
||||
|
||||
Upstream status [webkit] : backport
|
||||
Upstream status [qtwebkit] : unclear
|
||||
|
||||
Bug: https://bugs.webkit.org/show_bug.cgi?id=70610
|
||||
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
|
||||
Downloaded from:
|
||||
https://github.com/meta-qt5/meta-qt5/blob/krogoth/recipes-qt/qt5/qtwebkit/
|
||||
0002-Remove-TEXTREL-tag-in-x86.patch
|
||||
|
||||
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
|
||||
---
|
||||
Source/JavaScriptCore/jit/ThunkGenerators.cpp | 24 ++++++++++++++++++++++++
|
||||
Source/WTF/wtf/InlineASM.h | 2 ++
|
||||
2 files changed, 26 insertions(+)
|
||||
|
||||
diff --git a/Source/JavaScriptCore/jit/ThunkGenerators.cpp b/Source/JavaScriptCore/jit/ThunkGenerators.cpp
|
||||
index 9684df2..8af82d8 100644
|
||||
--- a/Source/JavaScriptCore/jit/ThunkGenerators.cpp
|
||||
+++ b/Source/JavaScriptCore/jit/ThunkGenerators.cpp
|
||||
@@ -524,6 +524,30 @@ double jsRound(double d)
|
||||
} \
|
||||
static MathThunk UnaryDoubleOpWrapper(function) = &function##Thunk;
|
||||
|
||||
+#elif CPU(X86) && COMPILER(GCC) && OS(LINUX) && defined(__PIC__)
|
||||
+#define defineUnaryDoubleOpWrapper(function) \
|
||||
+ asm( \
|
||||
+ ".text\n" \
|
||||
+ ".globl " SYMBOL_STRING(function##Thunk) "\n" \
|
||||
+ HIDE_SYMBOL(function##Thunk) "\n" \
|
||||
+ SYMBOL_STRING(function##Thunk) ":" "\n" \
|
||||
+ "pushl %ebx\n" \
|
||||
+ "subl $20, %esp\n" \
|
||||
+ "movsd %xmm0, (%esp) \n" \
|
||||
+ "call __x86.get_pc_thunk.bx\n" \
|
||||
+ "addl $_GLOBAL_OFFSET_TABLE_, %ebx\n" \
|
||||
+ "call " GLOBAL_REFERENCE(function) "\n" \
|
||||
+ "fstpl (%esp) \n" \
|
||||
+ "movsd (%esp), %xmm0 \n" \
|
||||
+ "addl $20, %esp\n" \
|
||||
+ "popl %ebx\n" \
|
||||
+ "ret\n" \
|
||||
+ );\
|
||||
+ extern "C" { \
|
||||
+ MathThunkCallingConvention function##Thunk(MathThunkCallingConvention); \
|
||||
+ } \
|
||||
+ static MathThunk UnaryDoubleOpWrapper(function) = &function##Thunk;
|
||||
+
|
||||
#elif CPU(X86) && COMPILER(GCC) && (PLATFORM(MAC) || OS(LINUX))
|
||||
#define defineUnaryDoubleOpWrapper(function) \
|
||||
asm( \
|
||||
diff --git a/Source/WTF/wtf/InlineASM.h b/Source/WTF/wtf/InlineASM.h
|
||||
index 0a2fe78..2dc40ef 100644
|
||||
--- a/Source/WTF/wtf/InlineASM.h
|
||||
+++ b/Source/WTF/wtf/InlineASM.h
|
||||
@@ -46,6 +46,8 @@
|
||||
#define GLOBAL_REFERENCE(name) #name "@plt"
|
||||
#elif CPU(X86) && COMPILER(MINGW)
|
||||
#define GLOBAL_REFERENCE(name) "@" #name "@4"
|
||||
+#elif OS(LINUX) && CPU(X86) && defined(__PIC__)
|
||||
+#define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) "@plt"
|
||||
#else
|
||||
#define GLOBAL_REFERENCE(name) SYMBOL_STRING(name)
|
||||
#endif
|
||||
--
|
||||
2.7.0
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
From 6c36f0ff8c1f5852c33d2b23714f9f187cc6ff26 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 5 Jun 2015 19:55:05 -0700
|
||||
Subject: [PATCH] Exclude backtrace() API for non-glibc libraries
|
||||
|
||||
It was excluding musl with current checks, so lets make it such that it
|
||||
considers only glibc when using backtrace API
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
Downloaded from:
|
||||
https://github.com/meta-qt5/meta-qt5/blob/krogoth/recipes-qt/qt5/qtwebkit/
|
||||
0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
|
||||
|
||||
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
|
||||
---
|
||||
Source/WTF/wtf/Assertions.cpp | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Source/WTF/wtf/Assertions.cpp b/Source/WTF/wtf/Assertions.cpp
|
||||
index 1b2091f..ba03a28 100644
|
||||
--- a/Source/WTF/wtf/Assertions.cpp
|
||||
+++ b/Source/WTF/wtf/Assertions.cpp
|
||||
@@ -61,7 +61,7 @@
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
-#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
|
||||
+#if (OS(DARWIN) || (OS(LINUX) && defined (__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID)
|
||||
#include <cxxabi.h>
|
||||
#include <dlfcn.h>
|
||||
#include <execinfo.h>
|
||||
@@ -245,7 +245,7 @@ void WTFReportArgumentAssertionFailure(const char* file, int line, const char* f
|
||||
|
||||
void WTFGetBacktrace(void** stack, int* size)
|
||||
{
|
||||
-#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
|
||||
+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID)
|
||||
*size = backtrace(stack, *size);
|
||||
#elif OS(WINDOWS) && !OS(WINCE)
|
||||
// The CaptureStackBackTrace function is available in XP, but it is not defined
|
||||
--
|
||||
2.7.0
|
||||
|
||||
@@ -6,7 +6,6 @@ config BR2_PACKAGE_QT5WEBKIT
|
||||
select BR2_PACKAGE_SQLITE
|
||||
select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT5BASE_XCB
|
||||
select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_QT5BASE_XCB
|
||||
# This module does not support static linking
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
|
||||
depends on !BR2_BINFMT_FLAT # icu
|
||||
@@ -16,8 +15,14 @@ config BR2_PACKAGE_QT5WEBKIT
|
||||
|
||||
This package corresponds to the qt5webkit module.
|
||||
|
||||
This package has been tagged as deprecated since version
|
||||
5.5.0 and should be replaced by Qt WebEngine module in
|
||||
new design.
|
||||
This package has been removed from the official release packages
|
||||
since Qt5.6.0, but it is still available for users to build it
|
||||
from source. This is useful for platforms without GPU since the
|
||||
successor (QtWebEngine) requires OpenGL support.
|
||||
|
||||
http://qt.io
|
||||
|
||||
comment "qt5webkit needs a toolchain w/ dynamic library"
|
||||
depends on BR2_STATIC_LIBS
|
||||
depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
|
||||
depends on !BR2_BINFMT_FLAT
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Hash from: http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtwebkit-opensource-src-5.5.1.tar.xz.mirrorlist
|
||||
sha256 77583f9dbd3e6ad874386df71b165dc3ce88efdabbc6e5d97a959ee2187d6d69 qtwebkit-opensource-src-5.5.1.tar.xz
|
||||
# locally computed
|
||||
sha256 e4339ee069e2817fc5bf7c2c2d9fa680874da4ba56f34afdad2b4795803cbdf1 qt5webkit-b889f460280ad98c89ede179bd3b9ce9cb02002b.tar.gz
|
||||
|
||||
@@ -4,21 +4,24 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
QT5WEBKIT_VERSION = $(QT5_VERSION)
|
||||
QT5WEBKIT_SITE = $(QT5_SITE)
|
||||
QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz
|
||||
QT5WEBKIT_DEPENDENCIES = qt5base sqlite host-ruby host-gperf host-bison host-flex
|
||||
QT5WEBKIT_VERSION = b889f460280ad98c89ede179bd3b9ce9cb02002b
|
||||
# Using GitHub since it supports downloading tarballs from random commits.
|
||||
# The http://code.qt.io/cgit/qt/qtwebkit.git/ repo doesn't allow to do so.
|
||||
QT5WEBKIT_SITE = $(call github,qtproject,qtwebkit,$(QT5WEBKIT_VERSION))
|
||||
QT5WEBKIT_DEPENDENCIES = \
|
||||
host-bison host-flex host-gperf host-python host-ruby \
|
||||
qt5base sqlite
|
||||
QT5WEBKIT_INSTALL_STAGING = YES
|
||||
|
||||
QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
|
||||
QT5WEBKIT_LICENSE = LGPLv2+ (WebCore), LGPLv2.1 with exception or LGPLv3 or GPLv2
|
||||
QT5WEBKIT_LICENSE = LGPLv2.1+, BSD-3c, BSD-2c
|
||||
# Source files contain references to LGPL_EXCEPTION.txt but it is not included
|
||||
# in the archive.
|
||||
QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv2
|
||||
QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21
|
||||
else
|
||||
QT5WEBKIT_LICENSE = LGPLv2+ (WebCore), Commercial license
|
||||
QT5WEBKIT_LICENSE = LGPLv2.1+ (WebCore), Commercial license
|
||||
QT5WEBKIT_REDISTRIBUTE = NO
|
||||
endif
|
||||
|
||||
@@ -30,16 +33,33 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
|
||||
QT5WEBKIT_DEPENDENCIES += qt5declarative
|
||||
endif
|
||||
|
||||
# QtWebkit's build system uses python, but only supports python2. We work
|
||||
# around this by forcing python2 early in the PATH, via a python->python2
|
||||
# symlink.
|
||||
QT5WEBKIT_ENV = PATH=$(@D)/bin:$(BR_PATH)
|
||||
define QT5WEBKIT_PYTHON2_SYMLINK
|
||||
mkdir -p $(@D)/bin
|
||||
ln -sf $(HOST_DIR)/usr/bin/python2 $(@D)/bin/python
|
||||
endef
|
||||
QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK
|
||||
|
||||
# Since we get the source from git, generated header files are not included.
|
||||
# qmake detects that header file generation (using the syncqt tool) must be
|
||||
# done based on the existence of a .git directory (cfr. the git_build config
|
||||
# option which is set in qt_build_paths.prf).
|
||||
# So, to make sure that qmake detects that header files must be generated,
|
||||
# create an empty .git directory.
|
||||
define QT5WEBKIT_CONFIGURE_CMDS
|
||||
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
|
||||
mkdir -p $(@D)/.git
|
||||
(cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(HOST_DIR)/usr/bin/qmake)
|
||||
endef
|
||||
|
||||
define QT5WEBKIT_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
|
||||
$(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(MAKE) -C $(@D)
|
||||
endef
|
||||
|
||||
define QT5WEBKIT_INSTALL_STAGING_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
|
||||
$(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(MAKE) -C $(@D) install
|
||||
$(QT5_LA_PRL_FILES_FIXUP)
|
||||
endef
|
||||
|
||||
|
||||
Reference in New Issue
Block a user