diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-05-14 14:39:26 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-14 14:48:32 +0200 |
| commit | c45fc409c14f2e4ccb1aacd0b8af36dbba399666 (patch) | |
| tree | 3001f0eb635822bf30533657db78c004892baf49 /patches | |
| parent | 99eb9c5879bf6aef99ac8db6bb0446a03fc8be2f (diff) | |
Update eLinux patch to match the snapshot
This also updates the snapshot shasum.
Change-Id: I4c76585d3285d33d5af5369dbb56b52f2434ef82
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/chromium/0022-Adjust-gyp-defines-for-eLinux.patch | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/patches/chromium/0022-Adjust-gyp-defines-for-eLinux.patch b/patches/chromium/0022-Adjust-gyp-defines-for-eLinux.patch index f478727e1..5be896da0 100644 --- a/patches/chromium/0022-Adjust-gyp-defines-for-eLinux.patch +++ b/patches/chromium/0022-Adjust-gyp-defines-for-eLinux.patch @@ -75,15 +75,6 @@ diff --git a/build/linux/system.gyp b/build/linux/system.gyp index 1451afb..2a2c8bd 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp -@@ -5,7 +5,7 @@ - { - 'variables': { - 'conditions': [ -- ['sysroot!=""', { -+ ['sysroot!="" and qt_os!="embedded_linux"', { - 'pkg-config': './pkg-config-wrapper "<(sysroot)" "<(target_arch)"', - }, { - 'pkg-config': 'pkg-config' @@ -506,6 +506,8 @@ { 'target_name': 'libpci', |