From owner-svn-ports-head@freebsd.org Sat May 16 19:23:45 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BF4AA2FB0C3; Sat, 16 May 2020 19:23:45 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49PZvP4gt6z3QdY; Sat, 16 May 2020 19:23:45 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9B7981AE07; Sat, 16 May 2020 19:23:45 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04GJNjhb040611; Sat, 16 May 2020 19:23:45 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04GJNjl8040608; Sat, 16 May 2020 19:23:45 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202005161923.04GJNjl8040608@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Sat, 16 May 2020 19:23:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r535496 - head/www/qt5-webkit/files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/www/qt5-webkit/files X-SVN-Commit-Revision: 535496 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2020 19:23:45 -0000 Author: pkubaj Date: Sat May 16 19:23:44 2020 New Revision: 535496 URL: https://svnweb.freebsd.org/changeset/ports/535496 Log: www/qt5-webkit: fix build on powerpc Same changes as those done for powerpc64 are necessary. Additionally, uc_mcontext.uc_regs doesn't exist on FreeBSD. PR: 246146 Approved by: tcberner (maintainer) Added: head/www/qt5-webkit/files/patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp (contents, props changed) Modified: head/www/qt5-webkit/files/patch-CMakeLists.txt head/www/qt5-webkit/files/patch-Source_WTF_wtf_Platform.h Modified: head/www/qt5-webkit/files/patch-CMakeLists.txt ============================================================================== --- head/www/qt5-webkit/files/patch-CMakeLists.txt Sat May 16 19:19:29 2020 (r535495) +++ head/www/qt5-webkit/files/patch-CMakeLists.txt Sat May 16 19:23:44 2020 (r535496) @@ -1,11 +1,14 @@ ---- CMakeLists.txt.orig 2018-10-14 18:01:08 UTC +--- CMakeLists.txt.orig 2020-03-04 17:16:37 UTC +++ CMakeLists.txt -@@ -73,6 +73,8 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc" +@@ -73,7 +73,11 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3 + set(WTF_CPU_X86 1) + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc") set(WTF_CPU_PPC 1) ++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "powerpc") ++ set(WTF_CPU_PPC 1) elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64") - set(WTF_CPU_PPC64 1) -+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "powerpc64") + set(WTF_CPU_PPC64 1) ++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "powerpc64") + set(WTF_CPU_PPC64 1) elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le") set(WTF_CPU_PPC64LE 1) - elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "parisc*") Added: head/www/qt5-webkit/files/patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/qt5-webkit/files/patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp Sat May 16 19:23:44 2020 (r535496) @@ -0,0 +1,11 @@ +--- Source/JavaScriptCore/heap/MachineStackMarker.cpp.orig 2020-05-03 17:05:08 UTC ++++ Source/JavaScriptCore/heap/MachineStackMarker.cpp +@@ -86,7 +86,7 @@ static void pthreadSignalHandlerSuspendResume(int, sig + } + + ucontext_t* userContext = static_cast(ucontext); +-#if CPU(PPC) ++#if CPU(PPC) && defined(WTF_OS_LINUX) + thread->suspendedMachineContext = *userContext->uc_mcontext.uc_regs; + #else + thread->suspendedMachineContext = userContext->uc_mcontext; Modified: head/www/qt5-webkit/files/patch-Source_WTF_wtf_Platform.h ============================================================================== --- head/www/qt5-webkit/files/patch-Source_WTF_wtf_Platform.h Sat May 16 19:19:29 2020 (r535495) +++ head/www/qt5-webkit/files/patch-Source_WTF_wtf_Platform.h Sat May 16 19:23:44 2020 (r535496) @@ -4,7 +4,7 @@ See PR 222612 Add proper architecture name: https://gcc.gnu.org/ml/gcc-patches/2015-06/msg01679.html ---- Source/WTF/wtf/Platform.h.orig 2017-06-04 20:16:06 UTC +--- Source/WTF/wtf/Platform.h.orig 2020-03-04 17:16:37 UTC +++ Source/WTF/wtf/Platform.h @@ -105,11 +105,15 @@ @@ -23,7 +23,17 @@ Add proper architecture name: #endif /* CPU(PPC64) - PowerPC 64-bit Little Endian */ -@@ -226,6 +230,7 @@ +@@ -135,6 +139,9 @@ + && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) + #define WTF_CPU_PPC 1 + #define WTF_CPU_BIG_ENDIAN 1 ++#define ENABLE_ASSEMBLER 0 ++#define ENABLE_JIT 0 ++#define ENABLE_SAMPLING_PROFILER 0 + #endif + + /* CPU(SH4) - SuperH SH-4 */ +@@ -226,6 +233,7 @@ #elif defined(__ARM_ARCH_6__) \ || defined(__ARM_ARCH_6J__) \ || defined(__ARM_ARCH_6K__) \ @@ -31,7 +41,7 @@ Add proper architecture name: || defined(__ARM_ARCH_6Z__) \ || defined(__ARM_ARCH_6ZK__) \ || defined(__ARM_ARCH_6T2__) \ -@@ -272,6 +277,7 @@ +@@ -273,6 +281,7 @@ #elif defined(__ARM_ARCH_6J__) \ || defined(__ARM_ARCH_6K__) \