Attachment 349346 Details for Bug 189488 – Patch

[patch] Patch

bug-189488-20180910155750.patch (text/plain), 2.02 KB, created by Tim Horton on 2018-09-10 15:57:51 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Horton

Created: 2018-09-10 15:57:51 PDT

Size: 2.02 KB

patch

obsolete

>Subversion Revision: 235861
>diff --git a/Source/Makefile b/Source/Makefile
>index 48ea26ad06f835e984f8a11a56c872b05b475826..61cfb87dcdb57c7fd7d07f49c9aa4ac3ff0208d7 100644
>--- a/Source/Makefile
>+++ b/Source/Makefile
>@@ -1,6 +1,10 @@
> LIBWEBRTC_MODULE = 
> WEBINSPECTORUI_MODULE =
> 
>+ifeq (iosmac,$(SDK_VARIANT))
>+	DISABLE_LIBWEBRTC = 1
>+endif
>+
> ifneq (,$(SDKROOT))
> 	ifneq (,$(findstring iphone,$(SDKROOT)))
> 		LIBWEBRTC_MODULE = ThirdParty/libwebrtc
>diff --git a/ChangeLog b/ChangeLog
>index 3db6d56ca752689900a0d4f272aefec54b173104..4377507ffad9de1462fe4b970c025eeabd8170fd 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-09-10  Tim Horton  <timothy_horton@apple.com>
>+
>+        Make it easier to build for SDK_VARIANT=iosmac
>+        https://bugs.webkit.org/show_bug.cgi?id=189488
>+        <rdar://problem/38254840>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Makefile:
>+        * Makefile.shared:
>+        * Source/Makefile:
>+        Set a variety of build flags (disable libwebrtc, tools, and set
>+        SDK_VARIANT and WK_ALTERNATE_FRAMEWORKS_DIR).
>+
> 2018-08-30  Don Olmstead  <don.olmstead@sony.com>
> 
>         [CMake] Replace AVFoundationSupport.py using CMake
>diff --git a/Makefile b/Makefile
>index d30c90acb49bfb710e8d5823b87b23ac2a7d684e..43b2d7f5f66b2fafc79ea8cfb6d40e04ccdfe68e 100644
>--- a/Makefile
>+++ b/Makefile
>@@ -1,5 +1,9 @@
> TOOLS_MODULE = Tools
> 
>+ifeq (iosmac,$(SDK_VARIANT))
>+	DISABLE_WEBKIT_TOOLS = 1
>+endif
>+
> ifneq (,$(DISABLE_WEBKIT_TOOLS))
> 	TOOLS_MODULE =
> endif
>diff --git a/Makefile.shared b/Makefile.shared
>index 7d1feb182a7507e178e2ecf1b619a6ea886ee5c0..87e7ad260b9cd98bcd62b80b4b8007acc5c77a96 100644
>--- a/Makefile.shared
>+++ b/Makefile.shared
>@@ -34,6 +34,11 @@ ifneq (,$(ARCHS))
> 	endif
> endif
> 
>+ifeq (iosmac,$(SDK_VARIANT))
>+	XCODE_OPTIONS += SDK_VARIANT=iosmac
>+	XCODE_OPTIONS += WK_ALTERNATE_FRAMEWORKS_DIR=/System/iOSSupport
>+endif
>+
> DEFAULT_VERBOSITY := $(shell defaults read org.webkit.BuildConfiguration BuildTranscriptVerbosity 2>/dev/null || echo "default")
> VERBOSITY ?= $(DEFAULT_VERBOSITY)
>

Flags:

wenson_hsieh: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 189488: 349346