diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2019-05-02 18:36:25 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-05-02 18:36:25 +0000 |
commit | f4531ec860071c308725a8539ef5003da11da8a1 (patch) | |
tree | ec0f371fabf425f46395beb111e2dd3b94e8dd34 /recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch | |
parent | 8586caf2f2f5c11fb2ddff29eefe5dd7fc08cf38 (diff) | |
download | meta-qt5-f4531ec860071c308725a8539ef5003da11da8a1.tar.gz |
qtwebengine: restore the fix for build with clang/libc++ on aarch64/arm
* it was fixed in:
https://github.com/meta-qt5/meta-qt5/commit/5be2654885b3699520c4370579c929e2ce352e80
* but then when upgrading to 5.12.3 from meta-qt5/qtwebengine I've accidentally overwritten
this one with the older version in:
https://github.com/meta-qt5/meta-qt5/commit/e2707a016c3475c167a421c9c73d88f81cc61bd1
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch index 7136b475..8de23c76 100644 --- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From bf92c8a03189d7a559aff7d62c2d9fc6047d2659 Mon Sep 17 00:00:00 2001 | 1 | From eb0b90b8809a8d8bd76999056d74d433a6c23184 Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 | 3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 |
4 | Subject: [PATCH] Force host toolchain configuration | 4 | Subject: [PATCH] Force host toolchain configuration |
@@ -18,7 +18,7 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> | |||
18 | 2 files changed, 8 insertions(+), 8 deletions(-) | 18 | 2 files changed, 8 insertions(+), 8 deletions(-) |
19 | 19 | ||
20 | diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro | 20 | diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro |
21 | index dd0d3e32..70161c82 100644 | 21 | index dd0d3e32..6312c867 100644 |
22 | --- a/src/buildtools/configure_host.pro | 22 | --- a/src/buildtools/configure_host.pro |
23 | +++ b/src/buildtools/configure_host.pro | 23 | +++ b/src/buildtools/configure_host.pro |
24 | @@ -4,7 +4,7 @@ TEMPLATE = aux | 24 | @@ -4,7 +4,7 @@ TEMPLATE = aux |
@@ -37,9 +37,9 @@ index dd0d3e32..70161c82 100644 | |||
37 | -" cc = \"$$which($$QMAKE_CC)\" " \ | 37 | -" cc = \"$$which($$QMAKE_CC)\" " \ |
38 | -" cxx = \"$$which($$QMAKE_CXX)\" " \ | 38 | -" cxx = \"$$which($$QMAKE_CXX)\" " \ |
39 | -" ld = \"$$which($$QMAKE_LINK)\" " \ | 39 | -" ld = \"$$which($$QMAKE_LINK)\" " \ |
40 | +" cc = \"$$which(gcc)\" " \ | 40 | +" cc = \"$$which($$CC_host)\" " \ |
41 | +" cxx = \"$$which(g++)\" " \ | 41 | +" cxx = \"$$which($$CXX_host)\" " \ |
42 | +" ld = \"$$which(g++)\" " \ | 42 | +" ld = \"$$which($$CXX_host)\" " \ |
43 | " ar = \"$$which(ar)\" " \ | 43 | " ar = \"$$which(ar)\" " \ |
44 | " nm = \"$$which(nm)\" " \ | 44 | " nm = \"$$which(nm)\" " \ |
45 | " extra_cppflags = \"$$GN_HOST_EXTRA_CPPFLAGS\" " \ | 45 | " extra_cppflags = \"$$GN_HOST_EXTRA_CPPFLAGS\" " \ |
@@ -50,9 +50,9 @@ index dd0d3e32..70161c82 100644 | |||
50 | -" cc = \"$$which($$QMAKE_CC)\" " \ | 50 | -" cc = \"$$which($$QMAKE_CC)\" " \ |
51 | -" cxx = \"$$which($$QMAKE_CXX)\" " \ | 51 | -" cxx = \"$$which($$QMAKE_CXX)\" " \ |
52 | -" ld = \"$$which($$QMAKE_LINK)\" " \ | 52 | -" ld = \"$$which($$QMAKE_LINK)\" " \ |
53 | +" cc = \"$$which(gcc)\" " \ | 53 | +" cc = \"$$which($$CC_host)\" " \ |
54 | +" cxx = \"$$which(g++)\" " \ | 54 | +" cxx = \"$$which($$CXX_host)\" " \ |
55 | +" ld = \"$$which(g++)\" " \ | 55 | +" ld = \"$$which($$CXX_host)\" " \ |
56 | " ar = \"$$which(ar)\" " \ | 56 | " ar = \"$$which(ar)\" " \ |
57 | " nm = \"$$which(nm)\" " \ | 57 | " nm = \"$$which(nm)\" " \ |
58 | " toolchain_args = { " \ | 58 | " toolchain_args = { " \ |