blob: bb632b0fd070d79c9300b2ee2bc34a0608983d53 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
Index: Source/cmake/WebKitCommon.cmake
--- Source/cmake/WebKitCommon.cmake.orig
+++ Source/cmake/WebKitCommon.cmake
@@ -111,7 +111,7 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
endif ()
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
set(WTF_CPU_X86 1)
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc")
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc|powerpc)")
set(WTF_CPU_PPC 1)
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64")
set(WTF_CPU_PPC64 1)
@@ -119,6 +119,8 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
set(WTF_CPU_PPC64LE 1)
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^riscv64")
set(WTF_CPU_RISCV64 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "sparc64")
+ set(WTF_CPU_SPARC64 1)
else ()
set(WTF_CPU_UNKNOWN 1)
endif ()
@@ -190,9 +192,9 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
# We cannot check for RUBY_FOUND because it is set only when the full package is installed and
# the only thing we need is the interpreter. Unlike Python, cmake does not provide a macro
# for finding only the Ruby interpreter.
- find_package(Ruby 1.9)
- if (NOT RUBY_EXECUTABLE OR RUBY_VERSION VERSION_LESS 1.9)
- message(FATAL_ERROR "Ruby 1.9 or higher is required.")
+ find_package(Ruby ${MODRUBY_LIBREV})
+ if (NOT RUBY_EXECUTABLE OR RUBY_VERSION VERSION_LESS ${MODRUBY_LIBREV})
+ message(FATAL_ERROR "Ruby ${MODRUBY_LIBREV} or higher is required.")
endif ()
# -----------------------------------------------------------------------------
@@ -204,7 +206,7 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
include(CheckCXXCompilerFlag)
include(CheckCXXSourceCompiles)
include(CheckFunctionExists)
- include(CheckIncludeFile)
+ include(CheckIncludeFiles)
include(CheckSymbolExists)
include(CheckStructHasMember)
include(CheckTypeSize)
|
