Backport upstream patch to fix GN FTBFS on aarch64 (QTBUG-61128)
This commit is contained in:
parent
4422cf08d8
commit
9dda045143
@ -100,6 +100,9 @@ Patch12: qtwebengine-opensource-src-5.9.0-webrtc-neon-detect.patch
|
|||||||
Patch20: qtwebengine-opensource-src-5.8.0-qt57.patch
|
Patch20: qtwebengine-opensource-src-5.8.0-qt57.patch
|
||||||
# Force verbose output from the GN bootstrap process
|
# Force verbose output from the GN bootstrap process
|
||||||
Patch21: qtwebengine-opensource-src-5.9.0-gn-bootstrap-verbose.patch
|
Patch21: qtwebengine-opensource-src-5.9.0-gn-bootstrap-verbose.patch
|
||||||
|
# Backport upstream patch to fix GN FTBFS on aarch64 (QTBUG-61128)
|
||||||
|
# https://codereview.qt-project.org/196178
|
||||||
|
Patch100: qtwebengine-opensource-src-5.9.0-gn-aarch64.patch
|
||||||
|
|
||||||
%if 0%{?fedora} && 0%{?fedora} < 25
|
%if 0%{?fedora} && 0%{?fedora} < 25
|
||||||
# work around missing qt5_qtwebengine_arches macro on F24
|
# work around missing qt5_qtwebengine_arches macro on F24
|
||||||
@ -344,6 +347,7 @@ BuildArch: noarch
|
|||||||
%patch12 -p1 -b .webrtc-neon-detect
|
%patch12 -p1 -b .webrtc-neon-detect
|
||||||
%patch20 -p1 -b .qt57
|
%patch20 -p1 -b .qt57
|
||||||
%patch21 -p1 -b .gn-bootstrap-verbose
|
%patch21 -p1 -b .gn-bootstrap-verbose
|
||||||
|
%patch100 -p1 -b .gn-aarch64
|
||||||
# fix // in #include in content/renderer/gpu to avoid debugedit failure
|
# fix // in #include in content/renderer/gpu to avoid debugedit failure
|
||||||
sed -i -e 's!gpu//!gpu/!g' \
|
sed -i -e 's!gpu//!gpu/!g' \
|
||||||
src/3rdparty/chromium/content/renderer/gpu/compositor_forwarding_message_filter.cc
|
src/3rdparty/chromium/content/renderer/gpu/compositor_forwarding_message_filter.cc
|
||||||
@ -557,6 +561,7 @@ done
|
|||||||
- Drop the flag hacks (-g1 -fno-delete-null-pointer-checks) that are fixed
|
- Drop the flag hacks (-g1 -fno-delete-null-pointer-checks) that are fixed
|
||||||
upstream, force -g2 on x86_64 instead
|
upstream, force -g2 on x86_64 instead
|
||||||
- Force verbose output from the GN bootstrap process
|
- Force verbose output from the GN bootstrap process
|
||||||
|
- Backport upstream patch to fix GN FTBFS on aarch64 (QTBUG-61128)
|
||||||
|
|
||||||
* Sat May 13 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.8.0-14
|
* Sat May 13 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.8.0-14
|
||||||
- fix rpm macros
|
- fix rpm macros
|
||||||
|
43
qtwebengine-opensource-src-5.9.0-gn-aarch64.patch
Normal file
43
qtwebengine-opensource-src-5.9.0-gn-aarch64.patch
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
From 801c957651fba94b5d7dde9cc490378a4dc3a987 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
||||||
|
Date: Thu, 1 Jun 2017 11:40:02 +0200
|
||||||
|
Subject: [PATCH] [Backport] GN: Add Arm64 Linux support
|
||||||
|
|
||||||
|
Add Arm64 linux support be able to build GN binary for
|
||||||
|
native arm64 builds.
|
||||||
|
|
||||||
|
R=dpranke@chromium.org, brettw@chromium.org
|
||||||
|
|
||||||
|
Review-Url: https://codereview.chromium.org/2550673002
|
||||||
|
|
||||||
|
Task-number: QTBUG-61128
|
||||||
|
Change-Id: I3aa6b6ca7df374428a7f4a8b4db9f488a8926f6c
|
||||||
|
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
||||||
|
---
|
||||||
|
chromium/tools/gn/args.cc | 3 +++
|
||||||
|
1 file changed, 3 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/3rdparty/chromium/tools/gn/args.cc b/src/3rdparty/chromium/tools/gn/args.cc
|
||||||
|
index 7285d7a..54703e1 100644
|
||||||
|
--- a/src/3rdparty/chromium/tools/gn/args.cc
|
||||||
|
+++ b/src/3rdparty/chromium/tools/gn/args.cc
|
||||||
|
@@ -266,6 +266,7 @@ void Args::SetSystemVarsLocked(Scope* dest) const {
|
||||||
|
static const char kX86[] = "x86";
|
||||||
|
static const char kX64[] = "x64";
|
||||||
|
static const char kArm[] = "arm";
|
||||||
|
+ static const char kArm64[] = "arm64";
|
||||||
|
static const char kMips[] = "mipsel";
|
||||||
|
static const char kS390X[] = "s390x";
|
||||||
|
static const char kPPC64[] = "ppc64";
|
||||||
|
@@ -280,6 +281,8 @@ void Args::SetSystemVarsLocked(Scope* dest) const {
|
||||||
|
arch = kX64;
|
||||||
|
else if (os_arch.substr(0, 3) == "arm")
|
||||||
|
arch = kArm;
|
||||||
|
+ else if (os_arch == "aarch64")
|
||||||
|
+ arch = kArm64;
|
||||||
|
else if (os_arch == "mips")
|
||||||
|
arch = kMips;
|
||||||
|
else if (os_arch == "s390x")
|
||||||
|
--
|
||||||
|
2.7.4
|
||||||
|
|
Loading…
Reference in New Issue
Block a user