From 3bd7f659f736818b84dd073db790c087c24e6307 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sun, 17 Jan 2016 00:54:00 +0100 Subject: [PATCH] no-sse2.patch: Fix an FTBFS in the gyp changes --- ...ne-opensource-src-5.6.0-beta-no-sse2.patch | 40 +++---------------- 1 file changed, 6 insertions(+), 34 deletions(-) diff --git a/qtwebengine-opensource-src-5.6.0-beta-no-sse2.patch b/qtwebengine-opensource-src-5.6.0-beta-no-sse2.patch index 03369f4..af66488 100644 --- a/qtwebengine-opensource-src-5.6.0-beta-no-sse2.patch +++ b/qtwebengine-opensource-src-5.6.0-beta-no-sse2.patch @@ -35,20 +35,8 @@ diff -Nur qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/breakpad/s '-m32', diff -Nur qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/build/common.gypi qtwebengine-opensource-src-5.6.0-beta-no-sse2/src/3rdparty/chromium/build/common.gypi --- qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/build/common.gypi 2015-12-10 18:17:21.000000000 +0100 -+++ qtwebengine-opensource-src-5.6.0-beta-no-sse2/src/3rdparty/chromium/build/common.gypi 2016-01-16 23:07:29.866545917 +0100 -@@ -198,6 +198,11 @@ - 'mips_dsp_rev%': 0, - - 'conditions': [ -+ ['target_arch=="ia32"', { -+ # Do not assume SSE2 by default (Fedora patch). -+ 'disable_sse2%': 1, -+ }], -+ - ['branding == "Chrome"', { - 'branding_path_component%': 'google_chrome', - }], -@@ -3901,21 +3906,28 @@ ++++ qtwebengine-opensource-src-5.6.0-beta-no-sse2/src/3rdparty/chromium/build/common.gypi 2016-01-17 00:35:41.821192830 +0100 +@@ -3901,16 +3901,12 @@ # value used during computation does not change depending on # how the compiler optimized the code, since the value is # always kept in its specified precision. @@ -62,29 +50,13 @@ diff -Nur qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/build/comm - '-mfpmath=sse', - '-mmmx', # Allows mmintrin.h for MMX intrinsics. '-m32', ++ # Refer to http://crbug.com/348761 for rationale and ++ # http://crbug.com/313032 for an example where the x87 ++ # floating-point precision issue has "bit" us in the past. ++ '-ffloat-store', ], 'ldflags': [ '-m32', - ], - 'conditions': [ -+ ['disable_sse2==0', { -+ 'cflags': [ -+ '-msse2', -+ '-mfpmath=sse', -+ '-mmmx', # Allows mmintrin.h for MMX intrinsics. -+ ], -+ }], -+ ['disable_sse2==1', { -+ # Refer to http://crbug.com/348761 for rationale and -+ # http://crbug.com/313032 for an example where the x87 -+ # floating-point precision issue has "bit" us in the past. -+ 'cflags': [ -+ '-ffloat-store', -+ ], -+ }], - # Use gold linker for Android ia32 target. - ['OS=="android"', { - # Use gold linker for Android ia32 target. diff -Nur qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/cc/BUILD.gn qtwebengine-opensource-src-5.6.0-beta-no-sse2/src/3rdparty/chromium/cc/BUILD.gn --- qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/cc/BUILD.gn 2015-12-10 18:17:21.000000000 +0100 +++ qtwebengine-opensource-src-5.6.0-beta-no-sse2/src/3rdparty/chromium/cc/BUILD.gn 2016-01-16 23:07:29.918546201 +0100