pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

webkit-gtk: Remove unused WTF_CPU_SPARC64 definition and sync with FreeBSD ports



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Fri Oct 5 10:07:52 2018 +0200
Changeset:	60585912ed4715eac762299f36681f23171a5521

Modified Files:
	webkit-gtk/distinfo
	webkit-gtk/patches/patch-CMakeLists.txt

Log Message:
webkit-gtk: Remove unused WTF_CPU_SPARC64 definition and sync with FreeBSD ports

WTF_CPU_SPARC64 definition (from OpenBSD ports) was not used so just remove it.

In order to support it several other files needs to be adjusted:

 - Source/JavaScriptCore/runtime/MachineContext.h
   (for registers used on sparc64)
 - Source/WTF/wtf/Platform.h

For more information please give a look to the patches in OpenBSD
ports regarding WTF_CPU_SPARC64.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=60585912ed4715eac762299f36681f23171a5521

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 webkit-gtk/distinfo                     |  2 +-
 webkit-gtk/patches/patch-CMakeLists.txt | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diffs:
diff --git a/webkit-gtk/distinfo b/webkit-gtk/distinfo
index 9b772a4117..190331b544 100644
--- a/webkit-gtk/distinfo
+++ b/webkit-gtk/distinfo
@@ -4,7 +4,7 @@ SHA1 (webkitgtk-2.22.2.tar.xz) = ff0c40e81e240aa0743f7e6483f175defebd1417
 RMD160 (webkitgtk-2.22.2.tar.xz) = f8f16a72800debdf9b74a03151299f16f69fcc1c
 SHA512 (webkitgtk-2.22.2.tar.xz) = 0bb885726872f128a0e0d71cbc75ba076e5c0c928c40e71e030c87444a7068568c568587514407d6549c27d0bfe121dc33f96f0c516d2ae1c6801e005ad52756
 Size (webkitgtk-2.22.2.tar.xz) = 16769120 bytes
-SHA1 (patch-CMakeLists.txt) = dacc4c2694c517ea34a3512ffd48731b21afa5b1
+SHA1 (patch-CMakeLists.txt) = 2f05f3682bda601c99544dafd8e79bd622dfc5a5
 SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = aad458e8b062c0833193f354ca96e7b3082f1ec7
 SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = f78e6150ed8901b3fe046b2ef182f50f1c7500a4
 SHA1 (patch-Source_JavaScriptCore_heap_MarkedSpace.cpp) = e6a23d5ef22bddd0a9606fb0e472960e4cf5673e
diff --git a/webkit-gtk/patches/patch-CMakeLists.txt b/webkit-gtk/patches/patch-CMakeLists.txt
index 9b827a35ec..939b890419 100644
--- a/webkit-gtk/patches/patch-CMakeLists.txt
+++ b/webkit-gtk/patches/patch-CMakeLists.txt
@@ -1,8 +1,7 @@
 $NetBSD: patch-CMakeLists.txt,v 1.4 2018/04/28 19:10:13 wiz Exp $
 
 - Fix support for arm
-- Fix support for ppc and add support for sparc64.
-  From FreeBSD and OpenBSD ports.
+- Fix support for ppc, from FreeBSD.
 
 --- CMakeLists.txt.orig	2018-09-06 11:51:31.000000000 +0000
 +++ CMakeLists.txt
@@ -15,19 +14,15 @@ $NetBSD: patch-CMakeLists.txt,v 1.4 2018/04/28 19:10:13 wiz Exp $
  elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
      set(WTF_CPU_ARM64 1)
  elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-@@ -95,12 +97,14 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR
+@@ -95,9 +97,9 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR
      set(WTF_CPU_X86_64 1)
  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")
+-elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64")
++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc64|powerpc64)")
      set(WTF_CPU_PPC64 1)
  elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le")
      set(WTF_CPU_PPC64LE 1)
-+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "sparc64")
-+    set(WTF_CPU_SPARC64 1)
- else ()
-     set(WTF_CPU_UNKNOWN 1)
- endif ()


Home | Main Index | Thread Index | Old Index