Attachment 370471 Details for Bug 198150 – patch

[patch] patch

0001-release-builds-of-webkit-cannot-be-used-to-generate-.patch (text/plain), 4.25 KB, created by Stephanie Lewis on 2019-05-22 17:26:25 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Stephanie Lewis

Created: 2019-05-22 17:26:25 PDT

Size: 4.25 KB

patch

obsolete

>From e4c6e53f8750fd72633aa1cab41745901d28c5c0 Mon Sep 17 00:00:00 2001
>From: Stephanie Lewis <slewis@apple.com>
>Date: Wed, 22 May 2019 17:25:07 -0700
>Subject: [PATCH] release builds of webkit cannot be used to generate a dyld
> shared cache https://bugs.webkit.org/show_bug.cgi?id=198150
> <rdar://problem/50675982>
>
>Reviewed by NOBODY (OOPS!).
>
>Restrict the -not_for_dyld_shared_cache linker flag to macosx
>
>Source/WebCore:
>
>* Configurations/WebCore.xcconfig:
>
>Source/WebKit:
>
>* Configurations/WebKit.xcconfig:
>---
> Source/WebCore/ChangeLog                       | 12 ++++++++++++
> Source/WebCore/Configurations/WebCore.xcconfig |  4 ++--
> Source/WebKit/ChangeLog                        | 13 +++++++++++++
> Source/WebKit/Configurations/WebKit.xcconfig   |  4 ++--
> 4 files changed, 29 insertions(+), 4 deletions(-)
>
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 2abed3accab8..7d3ed08497cf 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-05-22  Stephanie Lewis  <slewis@apple.com>
>+
>+        release builds of webkit cannot be used to generate a dyld shared cache
>+        https://bugs.webkit.org/show_bug.cgi?id=198150
>+        <rdar://problem/50675982>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Restrict the -not_for_dyld_shared_cache linker flag to macosx
>+
>+        * Configurations/WebCore.xcconfig:
>+
> 2019-05-20  Gabe Giosia  <giosia@google.com>
> 
>         Range getBoundingClientRect returning zero rect on simple text node with <br> before it
>diff --git a/Source/WebCore/Configurations/WebCore.xcconfig b/Source/WebCore/Configurations/WebCore.xcconfig
>index c78b52854fb1..a64a82405fe4 100644
>--- a/Source/WebCore/Configurations/WebCore.xcconfig
>+++ b/Source/WebCore/Configurations/WebCore.xcconfig
>@@ -175,8 +175,8 @@ WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)";
> WK_INSTALL_PATH_PREFIX = $(WK_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION)$(WK_MACOS_1015)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
> WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_MACOS_SINCE_1015_USE_STAGING_INSTALL_PATH_YES = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
> 
>-WK_RELOCATABLE_FRAMEWORK_LDFLAGS = $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS_$(WK_RELOCATABLE_FRAMEWORKS));
>-WK_RELOCATABLE_FRAMEWORK_LDFLAGS_YES = -Wl,-not_for_dyld_shared_cache;
>+WK_RELOCATABLE_FRAMEWORK_LDFLAGS = $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS_$(WK_RELOCATABLE_FRAMEWORKS)_$(WK_PLATFORM_NAME));
>+WK_RELOCATABLE_FRAMEWORK_LDFLAGS_YES_macosx = -Wl,-not_for_dyld_shared_cache;
> 
> // Enable InstallAPI support, when built with WEBCORE_ENABLE_INSTALLAPI=YES.
> SUPPORTS_TEXT_BASED_API = $(SUPPORTS_TEXT_BASED_API_$(TARGET_NAME))
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index efeb55cb9dfd..76d7530ba37e 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-05-22  Stephanie Lewis  <slewis@apple.com>
>+
>+        release builds of webkit cannot be used to generate a dyld shared cache
>+        https://bugs.webkit.org/show_bug.cgi?id=198150
>+        <rdar://problem/50675982>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Restrict the -not_for_dyld_shared_cache linker flag to macosx
>+
>+        * Configurations/WebKit.xcconfig:
>+
>+
> 2019-05-20  Ross Kirsling  <ross.kirsling@sony.com>
> 
>         [WinCairo] Implement Remote Web Inspector Client.
>diff --git a/Source/WebKit/Configurations/WebKit.xcconfig b/Source/WebKit/Configurations/WebKit.xcconfig
>index fee14791a81f..d9dda2c97ee6 100644
>--- a/Source/WebKit/Configurations/WebKit.xcconfig
>+++ b/Source/WebKit/Configurations/WebKit.xcconfig
>@@ -162,8 +162,8 @@ WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_MACOS_BEFORE_1015 = YES;
> WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=iphone*11.*] = YES;
> WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=iphone*12.*] = YES;
> 
>-WK_RELOCATABLE_FRAMEWORK_LDFLAGS = $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS_$(WK_RELOCATABLE_FRAMEWORKS));
>-WK_RELOCATABLE_FRAMEWORK_LDFLAGS_YES = -Wl,-not_for_dyld_shared_cache;
>+WK_RELOCATABLE_FRAMEWORK_LDFLAGS = $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS_$(WK_RELOCATABLE_FRAMEWORKS)_$(WK_PLATFORM_NAME));
>+WK_RELOCATABLE_FRAMEWORK_LDFLAGS_YES_macosx = -Wl,-not_for_dyld_shared_cache;
> 
> WK_HAVE_DEVICE_IDENTITY = $(WK_HAVE_DEVICE_IDENTITY_$(PLATFORM_NAME));
> WK_HAVE_DEVICE_IDENTITY_iphoneos = YES;
>-- 
>2.21.0 (Apple Git-118)
>

Flags:

mitz: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 198150: 370471