rpms/qt5-qtwebengine
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Backport patch to fix FTBFS with GCC on aarch64 from upstream Chromium

Browse Source
This commit is contained in:
Kevin Kofler 2017-06-10 23:27:07 +02:00
parent f6784380ac
commit 0b8f82e836
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qt5-qtwebengine.spec
View File

@ -103,6 +103,9 @@ 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
# Backport patch to fix FTBFS with GCC on aarch64 from upstream Chromium
# https://codereview.chromium.org/2545053002
Patch101: qtwebengine-opensource-src-5.9.0-aarch64-gcc-toolchain.patch
%if 0%{?fedora} && 0%{?fedora} < 25
# work around missing qt5_qtwebengine_arches macro on F24
@ -348,6 +351,7 @@ BuildArch: noarch
%patch20 -p1 -b .qt57
%patch21 -p1 -b .gn-bootstrap-verbose
%patch100 -p1 -b .gn-aarch64
%patch101 -p1 -b .aarch64-gcc-toolchain
# fix // in #include in content/renderer/gpu to avoid debugedit failure
sed -i -e 's!gpu//!gpu/!g' \
src/3rdparty/chromium/content/renderer/gpu/compositor_forwarding_message_filter.cc
@ -562,6 +566,7 @@ done
upstream, force -g2 on x86_64 instead
- Force verbose output from the GN bootstrap process
- Backport upstream patch to fix GN FTBFS on aarch64 (QTBUG-61128)
- Backport patch to fix FTBFS with GCC on aarch64 from upstream Chromium
* Sat May 13 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.8.0-14
- fix rpm macros

30
qtwebengine-opensource-src-5.9.0-aarch64-gcc-toolchain.patch Normal file
View File

@ -0,0 +1,30 @@
Index: src/3rdparty/chromium/build/toolchain/linux/BUILD.gn
diff --git a/src/3rdparty/chromium/build/toolchain/linux/BUILD.gn b/src/3rdparty/chromium/build/toolchain/linux/BUILD.gn
index 548722d3938017ac936b9088b7a686c2afbbb5fe..86cd7dabc6e86d22a266817dfbb3bf0c719f7992 100644
--- a/src/3rdparty/chromium/build/toolchain/linux/BUILD.gn
+++ b/src/3rdparty/chromium/build/toolchain/linux/BUILD.gn
@@ -21,6 +21,24 @@ clang_toolchain("clang_arm64") {
}
}
+gcc_toolchain("arm64") {
+ toolprefix = "aarch64-linux-gnu-"
+
+ cc = "${toolprefix}gcc"
+ cxx = "${toolprefix}g++"
+
+ ar = "${toolprefix}ar"
+ ld = cxx
+ readelf = "${toolprefix}readelf"
+ nm = "${toolprefix}nm"
+
+ toolchain_args = {
+ current_cpu = "arm64"
+ current_os = "linux"
+ is_clang = false
+ }
+}
+
gcc_toolchain("arm") {
toolprefix = "arm-linux-gnueabihf-"