diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2017-03-28 13:43:54 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-03-29 04:49:46 +0000 |
commit | 2c08094d7553c087b8a16955a8da8a9f7b3cdc66 (patch) | |
tree | e07cd954eb2875edb8e0316cbdbeee5aad3ff968 /recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch | |
parent | f108145d26bc9a5d9b3164137117df8b84f65a98 (diff) | |
download | meta-qt5-2c08094d7553c087b8a16955a8da8a9f7b3cdc66.tar.gz |
qtwebengine: update to latest version
Includes fix for Intel NUC build, where target and host have
the same architecture. Remove no longer required patches.
Last chromium patch left in place as it might still be required.
Task-number: QTBUG-59768
Change-Id: I2c598926e56c07224fffb43af98834d225b10bad
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
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 | 12 |
1 files changed, 5 insertions, 7 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 65d170c5..130f3a38 100644 --- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch | |||
@@ -52,17 +52,15 @@ index 75b9690..601f688 100755 | |||
52 | else: | 52 | else: |
53 | - cc = os.environ.get('CC', 'cc') | 53 | - cc = os.environ.get('CC', 'cc') |
54 | - cxx = os.environ.get('CXX', 'c++') | 54 | - cxx = os.environ.get('CXX', 'c++') |
55 | - ld = os.environ.get('LD', cxx) | 55 | + cc = os.environ.get('CC_host', 'cc') |
56 | + cxx = os.environ.get('CXX_host', 'c++') | ||
57 | ld = cxx | ||
56 | - ar = os.environ.get('AR', 'ar') | 58 | - ar = os.environ.get('AR', 'ar') |
57 | - | 59 | + ar = os.environ.get('AR_host', 'ar') |
60 | |||
58 | - cflags = os.environ.get('CFLAGS', '').split() | 61 | - cflags = os.environ.get('CFLAGS', '').split() |
59 | - cflags_cc = os.environ.get('CXXFLAGS', '').split() | 62 | - cflags_cc = os.environ.get('CXXFLAGS', '').split() |
60 | - ldflags = os.environ.get('LDFLAGS', '').split() | 63 | - ldflags = os.environ.get('LDFLAGS', '').split() |
61 | + cc = os.environ.get('CC_host', 'cc') | ||
62 | + cxx = os.environ.get('CXX_host', 'c++') | ||
63 | + ld = os.environ.get('LD_host', cxx) | ||
64 | + ar = os.environ.get('AR_host', 'ar') | ||
65 | + | ||
66 | + cflags = os.environ.get('CFLAGS_host', '').split() | 64 | + cflags = os.environ.get('CFLAGS_host', '').split() |
67 | + cflags_cc = os.environ.get('CXXFLAGS_host', '').split() | 65 | + cflags_cc = os.environ.get('CXXFLAGS_host', '').split() |
68 | + ldflags = os.environ.get('LDFLAGS_host', '').split() | 66 | + ldflags = os.environ.get('LDFLAGS_host', '').split() |