Sun Dec 23 22:22:47 2018 UTC ()
Wups, quickly revert part of a mistaken commit.


(roy)
diff -r1.6 -r1.7 pkgsrc/www/webkit-gtk/patches/patch-CMakeLists.txt
cvs diff -r1.6 -r1.7 pkgsrc/www/webkit-gtk/patches/Attic/patch-CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/patches/Attic/patch-CMakeLists.txt 2018/12/23 22:18:14 1.6
+++ pkgsrc/www/webkit-gtk/patches/Attic/patch-CMakeLists.txt 2018/12/23 22:22:47 1.7
@@ -1,29 +1,20 @@ @@ -1,29 +1,20 @@
1$NetBSD: patch-CMakeLists.txt,v 1.6 2018/12/23 22:18:14 roy Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.7 2018/12/23 22:22:47 roy Exp $
2 2
3- Fix support for arm 3- Fix support for arm
4- Fix support for ppc, from FreeBSD. 4- Fix support for ppc, from FreeBSD.
5 5
6--- CMakeLists.txt.orig 2018-12-13 01:57:34.000000000 +0000 6--- CMakeLists.txt.orig 2018-12-13 01:57:34.000000000 +0000
7+++ CMakeLists.txt 7+++ CMakeLists.txt
8@@ -19,7 +19,7 @@ else () 
9 message(STATUS "The CMake build type is: ${CMAKE_BUILD_TYPE}") 
10 endif () 
11  
12-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake") 
13+set (CMAKE_MODULE_PATH "/usr/obj.pkgsrc/www/webkit-gtk/work/.buildlink/cmake-Modules" "${CMAKE_SOURCE_DIR}/Source/cmake") 
14  
15 set(ENABLE_WEBCORE ON) 
16  
17@@ -85,6 +85,8 @@ else () 8@@ -85,6 +85,8 @@ else ()
18 endif () 9 endif ()
19 if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") 10 if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
20 set(WTF_CPU_ARM 1) 11 set(WTF_CPU_ARM 1)
21+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^earm") 12+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^earm")
22+ set(WTF_CPU_ARM 1) 13+ set(WTF_CPU_ARM 1)
23 elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") 14 elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
24 set(WTF_CPU_ARM64 1) 15 set(WTF_CPU_ARM64 1)
25 elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64") 16 elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
26@@ -95,9 +97,9 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR 17@@ -95,9 +97,9 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR
27 set(WTF_CPU_X86_64 1) 18 set(WTF_CPU_X86_64 1)
28 elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)") 19 elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
29 set(WTF_CPU_X86 1) 20 set(WTF_CPU_X86 1)