diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-05-22 20:43:17 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-05 00:23:00 +0200 |
| commit | 4f195e3b634b2cb96e6f74d8b9d90f77a44830f5 (patch) | |
| tree | 4c82d144e5b384045bdc32ca2adee82684377a9d /patches/chromium/v8/0001-Prevent-V8-from-overridding-the-RuntimeLibrary-cflag.patch | |
| parent | 45c0bba8a40bb87a386fad02ca51371a44f475ba (diff) | |
Remove separately maintained patches from repository
We maintain them on top of the Chromium snapshot.
A new script tools/scripts/patch_upstream.py replaced
patches/patch-chromium.sh with the recent snapshot update.
The patches that we have on top of the baseline version
are prepared from the chromium snapshot and applied on
the upstream chromium checkout.
A consequence of this is that init-repository.py -u
from now on requires a snapshot checkout as well.
Change-Id: I639c45904b72952804e5227ebc948a8859cf74dd
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'patches/chromium/v8/0001-Prevent-V8-from-overridding-the-RuntimeLibrary-cflag.patch')
| -rw-r--r-- | patches/chromium/v8/0001-Prevent-V8-from-overridding-the-RuntimeLibrary-cflag.patch | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/patches/chromium/v8/0001-Prevent-V8-from-overridding-the-RuntimeLibrary-cflag.patch b/patches/chromium/v8/0001-Prevent-V8-from-overridding-the-RuntimeLibrary-cflag.patch deleted file mode 100644 index 0911d3abd..000000000 --- a/patches/chromium/v8/0001-Prevent-V8-from-overridding-the-RuntimeLibrary-cflag.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jocelyn Turcotte <jocelyn.turcotte@digia.com> -Date: Tue, 15 Apr 2014 14:22:52 +0200 -Subject: Prevent V8 from overridding the RuntimeLibrary cflags - -Since we're never going to statically link to the runtime library on -Windows (unlink Chromium when built as a monolitic chrome.exe), make -sure that our /M flag setting is also properly set for V8. - -Change-Id: Ia17073f6811f43aa264d08c270b1ab841a09408f -Reviewed-by: Michael Bruning <michael.bruning@digia.com> ---- - build/toolchain.gypi | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/build/toolchain.gypi b/build/toolchain.gypi -index 99f357a..2dc3c04 100644 ---- a/build/toolchain.gypi -+++ b/build/toolchain.gypi -@@ -444,7 +444,7 @@ - ['v8_optimized_debug==0', { - 'Optimization': '0', - 'conditions': [ -- ['component=="shared_library"', { -+ ['component=="shared_library" or use_qt==1', { - 'RuntimeLibrary': '3', # /MDd - }, { - 'RuntimeLibrary': '1', # /MTd -@@ -459,7 +459,7 @@ - 'StringPooling': 'true', - 'BasicRuntimeChecks': '0', - 'conditions': [ -- ['component=="shared_library"', { -+ ['component=="shared_library" or use_qt==1', { - 'RuntimeLibrary': '3', # /MDd - }, { - 'RuntimeLibrary': '1', # /MTd -@@ -474,7 +474,7 @@ - 'StringPooling': 'true', - 'BasicRuntimeChecks': '0', - 'conditions': [ -- ['component=="shared_library"', { -+ ['component=="shared_library" or use_qt==1', { - 'RuntimeLibrary': '3', #/MDd - }, { - 'RuntimeLibrary': '1', #/MTd -@@ -666,7 +666,7 @@ - 'FavorSizeOrSpeed': '0', - 'StringPooling': 'true', - 'conditions': [ -- ['component=="shared_library"', { -+ ['component=="shared_library" or use_qt==1', { - 'RuntimeLibrary': '2', #/MD - }, { - 'RuntimeLibrary': '0', #/MT |