Title: [215408] trunk
- Revision
- 215408
- Author
- utatane....@gmail.com
- Date
- 2017-04-17 06:51:21 -0700 (Mon, 17 Apr 2017)
Log Message
[JSCOnly] Fix build failures in macOS
https://bugs.webkit.org/show_bug.cgi?id=170887
Reviewed by Alex Christensen.
.:
Align ICU header configuration to MacCMake port.
* Source/cmake/OptionsJSCOnly.cmake:
Source/_javascript_Core:
Align ICU header configuration to MacCMake port.
* PlatformJSCOnly.cmake:
Source/WTF:
JSCOnly port does not use mac/MainThread.cpp.
We change the ifdef gurard to use generic implementaion in JSCOnly on macOS.
* wtf/MainThread.cpp:
* wtf/PlatformJSCOnly.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (215407 => 215408)
--- trunk/ChangeLog 2017-04-17 08:24:48 UTC (rev 215407)
+++ trunk/ChangeLog 2017-04-17 13:51:21 UTC (rev 215408)
@@ -1,3 +1,14 @@
+2017-04-17 Yusuke Suzuki <utatane....@gmail.com>
+
+ [JSCOnly] Fix build failures in macOS
+ https://bugs.webkit.org/show_bug.cgi?id=170887
+
+ Reviewed by Alex Christensen.
+
+ Align ICU header configuration to MacCMake port.
+
+ * Source/cmake/OptionsJSCOnly.cmake:
+
2017-04-16 Sam Weinig <s...@webkit.org>
[WebIDL] Switch IDLAttributes.txt over to a more structured format so that more information can be added for each attribute
Modified: trunk/Source/_javascript_Core/ChangeLog (215407 => 215408)
--- trunk/Source/_javascript_Core/ChangeLog 2017-04-17 08:24:48 UTC (rev 215407)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-04-17 13:51:21 UTC (rev 215408)
@@ -1,3 +1,14 @@
+2017-04-17 Yusuke Suzuki <utatane....@gmail.com>
+
+ [JSCOnly] Fix build failures in macOS
+ https://bugs.webkit.org/show_bug.cgi?id=170887
+
+ Reviewed by Alex Christensen.
+
+ Align ICU header configuration to MacCMake port.
+
+ * PlatformJSCOnly.cmake:
+
2017-04-17 JF Bastien <jfbast...@apple.com>
B3: don't allow unsigned offsets in Value
Modified: trunk/Source/_javascript_Core/PlatformJSCOnly.cmake (215407 => 215408)
--- trunk/Source/_javascript_Core/PlatformJSCOnly.cmake 2017-04-17 08:24:48 UTC (rev 215407)
+++ trunk/Source/_javascript_Core/PlatformJSCOnly.cmake 2017-04-17 13:51:21 UTC (rev 215408)
@@ -8,3 +8,9 @@
${GLIB_LIBRARIES}
)
endif ()
+
+if (APPLE)
+ list(APPEND _javascript_Core_INCLUDE_DIRECTORIES
+ ${_javascript_CORE_DIR}/icu
+ )
+endif ()
Modified: trunk/Source/WTF/ChangeLog (215407 => 215408)
--- trunk/Source/WTF/ChangeLog 2017-04-17 08:24:48 UTC (rev 215407)
+++ trunk/Source/WTF/ChangeLog 2017-04-17 13:51:21 UTC (rev 215408)
@@ -1,3 +1,16 @@
+2017-04-17 Yusuke Suzuki <utatane....@gmail.com>
+
+ [JSCOnly] Fix build failures in macOS
+ https://bugs.webkit.org/show_bug.cgi?id=170887
+
+ Reviewed by Alex Christensen.
+
+ JSCOnly port does not use mac/MainThread.cpp.
+ We change the ifdef gurard to use generic implementaion in JSCOnly on macOS.
+
+ * wtf/MainThread.cpp:
+ * wtf/PlatformJSCOnly.cmake:
+
2017-04-17 JF Bastien <jfbast...@apple.com>
B3: don't allow unsigned offsets in Value
Modified: trunk/Source/WTF/wtf/MainThread.cpp (215407 => 215408)
--- trunk/Source/WTF/wtf/MainThread.cpp 2017-04-17 08:24:48 UTC (rev 215407)
+++ trunk/Source/WTF/wtf/MainThread.cpp 2017-04-17 13:51:21 UTC (rev 215408)
@@ -41,7 +41,7 @@
namespace WTF {
static bool callbacksPaused; // This global variable is only accessed from main thread.
-#if !OS(DARWIN) && !USE(GLIB)
+#if !PLATFORM(COCOA) && !USE(GLIB)
static ThreadIdentifier mainThreadIdentifier;
#endif
@@ -53,7 +53,7 @@
return functionQueue;
}
-#if OS(DARWIN) || USE(GLIB)
+#if PLATFORM(COCOA) || USE(GLIB)
static pthread_once_t initializeMainThreadKeyOnce = PTHREAD_ONCE_INIT;
static void initializeMainThreadOnce()
@@ -178,7 +178,7 @@
scheduleDispatchFunctionsOnMainThread();
}
-#if !OS(DARWIN) && !USE(GLIB)
+#if !PLATFORM(COCOA) && !USE(GLIB)
bool isMainThread()
{
return currentThread() == mainThreadIdentifier;
Modified: trunk/Source/WTF/wtf/PlatformJSCOnly.cmake (215407 => 215408)
--- trunk/Source/WTF/wtf/PlatformJSCOnly.cmake 2017-04-17 08:24:48 UTC (rev 215407)
+++ trunk/Source/WTF/wtf/PlatformJSCOnly.cmake 2017-04-17 13:51:21 UTC (rev 215408)
@@ -38,3 +38,9 @@
list(APPEND WTF_LIBRARIES
${CMAKE_THREAD_LIBS_INIT}
)
+
+if (APPLE)
+ list(APPEND WTF_INCLUDE_DIRECTORIES
+ "${WTF_DIR}/icu"
+ )
+endif ()
Modified: trunk/Source/cmake/OptionsJSCOnly.cmake (215407 => 215408)
--- trunk/Source/cmake/OptionsJSCOnly.cmake 2017-04-17 08:24:48 UTC (rev 215407)
+++ trunk/Source/cmake/OptionsJSCOnly.cmake 2017-04-17 13:51:21 UTC (rev 215408)
@@ -47,11 +47,6 @@
if (NOT APPLE)
find_package(ICU REQUIRED)
else ()
- set(ICU_INCLUDE_DIRS
- "${WEBCORE_DIR}/icu"
- "${_javascript_CORE_DIR}/icu"
- "${WTF_DIR}/icu"
- )
set(ICU_LIBRARIES libicucore.dylib)
endif ()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
