Attachment 343698 Details for Bug 187086 – Patch

[patch] Patch

bug-187086-20180627003459.patch (text/plain), 4.39 KB, created by Adam Barth on 2018-06-27 00:35:00 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Barth

Created: 2018-06-27 00:35:00 PDT

Size: 4.39 KB

patch

obsolete

>Index: ChangeLog
>===================================================================
>--- ChangeLog	(revision 233246)
>+++ ChangeLog	(working copy)
>@@ -1,3 +1,16 @@
>+2018-06-27  Adam Barth  <abarth@webkit.org>
>+
>+        Add Fuchsia support to build-jsc
>+        https://bugs.webkit.org/show_bug.cgi?id=187086
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add Fuchsia port to cmake build system. After this patch, the build
>+        errors out due to a missing sysroot.
>+
>+        * CMakeLists.txt:
>+        * Source/cmake/OptionsFuchsia.cmake: Added.
>+
> 2018-06-18  Zan Dobersek  <zdobersek@igalia.com>
> 
>         Unreviewed GTK+ gardening. Updating the WPT expectations by removing
>Index: CMakeLists.txt
>===================================================================
>--- CMakeLists.txt	(revision 233246)
>+++ CMakeLists.txt	(working copy)
>@@ -37,6 +37,7 @@ endif ()
> set(ALL_PORTS
>     AppleWin
>     Efl
>+    Fuchsia
>     GTK
>     JSCOnly
>     Mac
>Index: Source/cmake/OptionsFuchsia.cmake
>===================================================================
>--- Source/cmake/OptionsFuchsia.cmake	(nonexistent)
>+++ Source/cmake/OptionsFuchsia.cmake	(working copy)
>@@ -0,0 +1,29 @@
>+set(PROJECT_VERSION_MAJOR 1)
>+set(PROJECT_VERSION_MINOR 0)
>+set(PROJECT_VERSION_MICRO 0)
>+set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_MICRO})
>+
>+set(CMAKE_SYSTEM_NAME Fuchsia)
>+
>+if (WTF_CPU_ARM64)
>+    set(triple aarch64-unknown-fuchsia)
>+elseif (WTF_CPU_X86_64)
>+    set(triple x86_64-unknown-fuchsia)
>+else ()
>+    message(FATAL_ERROR "Unknown ARCH '${CMAKE_SYSTEM_PROCESSOR}'")
>+endif ()
>+
>+set(CMAKE_C_COMPILER_TARGET ${triple})
>+set(CMAKE_CXX_COMPILER_TARGET ${triple})
>+
>+WEBKIT_OPTION_BEGIN()
>+WEBKIT_OPTION_DEFINE(ENABLE_STATIC_JSC "Whether to build JavaScriptCore as a static library." PUBLIC OFF)
>+WEBKIT_OPTION_END()
>+
>+set(ENABLE_WEBCORE OFF)
>+set(ENABLE_WEBKIT_LEGACY OFF)
>+set(ENABLE_WEBKIT OFF)
>+set(ENABLE_API_TESTS OFF)
>+
>+SET_AND_EXPOSE_TO_BUILD(USE_GENERIC_EVENT_LOOP 1)
>+SET_AND_EXPOSE_TO_BUILD(WTF_DEFAULT_EVENT_LOOP 0)
>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 233246)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,25 @@
>+2018-06-27  Adam Barth  <abarth@webkit.org>
>+
>+        Add Fuchsia support to build-jsc
>+        https://bugs.webkit.org/show_bug.cgi?id=187086
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add Fuchsia port to webkitdirs.pm. This patch is sufficient to make
>+        build-jsc kick off a cmake for Fuchsia.
>+
>+        * Scripts/webkitdirs.pm:
>+        (determineSourceDir):
>+        (argumentsForConfiguration):
>+        (determineXcodeSDK):
>+        (findMatchingArguments):
>+        (determinePortName):
>+        (isFuchsia):
>+        (setupAppleWinEnv):
>+        (wrapperPrefixIfNeeded):
>+        (relaunchIOSSimulator):
>+        (debugMiniBrowser):
>+
> 2018-06-26  Chris Dumez  <cdumez@apple.com>
> 
>         Deal better with the network process crashing on startup
>Index: Tools/Scripts/webkitdirs.pm
>===================================================================
>--- Tools/Scripts/webkitdirs.pm	(revision 233246)
>+++ Tools/Scripts/webkitdirs.pm	(working copy)
>@@ -104,6 +104,7 @@ BEGIN {
> # Ports
> use constant {
>     AppleWin => "AppleWin",
>+    Fuchsia  => "Fuchsia",
>     GTK      => "GTK",
>     iOS      => "iOS",
>     tvOS     => "tvOS",
>@@ -476,6 +477,7 @@ sub argumentsForConfiguration()
>     push(@args, '--ios-simulator') if (defined $xcodeSDK && $xcodeSDK =~ /^iphonesimulator/);
>     push(@args, '--32-bit') if ($architecture ne "x86_64" and !isWin64());
>     push(@args, '--64-bit') if (isWin64());
>+    push(@args, '--fuchsia') if isFuchsia();
>     push(@args, '--gtk') if isGtk();
>     push(@args, '--wpe') if isWPE();
>     push(@args, '--jsc-only') if isJSCOnly();
>@@ -1189,6 +1191,7 @@ sub determinePortName()
>     return if defined $portName;
> 
>     my %argToPortName = (
>+        fuchsia => Fuchsia,
>         gtk => GTK,
>         'jsc-only' => JSCOnly,
>         wincairo => WinCairo,
>@@ -1244,6 +1247,11 @@ sub portName()
>     return $portName;
> }
> 
>+sub isFuchsia()
>+{
>+    return portName() eq Fuchsia;
>+}
>+
> sub isGtk()
> {
>     return portName() eq GTK;
>@@ -2023,7 +2031,7 @@ sub isCachedArgumentfileOutOfDate($@)
> 
> sub wrapperPrefixIfNeeded()
> {
>-    if (isAnyWindows() || isJSCOnly()) {
>+    if (isAnyWindows() || isJSCOnly() || isFuchsia()) {
>         return ();
>     }
>     if (isAppleCocoaWebKit()) {

Actions: View | Formatted Diff | Diff

Attachments on bug 187086: 343698