diff options
Diffstat (limited to 'www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp')
| -rw-r--r-- | www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp | 10 | 
1 files changed, 5 insertions, 5 deletions
diff --git a/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp b/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp index ae0078659196..f3eb3f4f1f91 100644 --- a/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp +++ b/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp @@ -1,11 +1,11 @@ ---- ./third_party/libjpeg_turbo/libjpeg.gyp.orig	2014-08-20 21:03:45.000000000 +0200 -+++ ./third_party/libjpeg_turbo/libjpeg.gyp	2014-08-21 23:18:11.000000000 +0200 -@@ -245,7 +245,7 @@ +--- third_party/libjpeg_turbo/libjpeg.gyp.orig	2014-09-04 00:29:24 UTC ++++ third_party/libjpeg_turbo/libjpeg.gyp +@@ -246,7 +246,7 @@               ],             },           }], --        [ 'OS=="linux" or OS=="freebsd" or (OS=="android" and target_arch!="arm")', { -+        [ 'OS=="linux" or os_bsd==1 or (OS=="android" and target_arch!="arm")', { +-        [ 'OS=="linux" or OS=="freebsd" or (OS=="android" and (target_arch=="ia32" or target_arch=="x64"))', { ++        [ 'OS=="linux" or os_bsd==1 or (OS=="android" and (target_arch=="ia32" or target_arch=="x64"))', {             'conditions': [               [ 'use_system_yasm==0', {                 'dependencies': [  | 
