From 694e3d33d57492edcd4cb62acf4c0a9f465bde27 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 12 Aug 2019 17:31:19 +0200
Subject: [PATCH] qt5-webkit: use nodebug on 32-bit hosts + fix ppc-musl build

[ci skip]

qt5-webkit: fix build on ppc-musl
---
 srcpkgs/qt5-webkit/patches/musl-ppc.patch | 14 ++++++++++++++
 srcpkgs/qt5-webkit/template               |  8 +++++---
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/qt5-webkit/patches/musl-ppc.patch

diff --git a/srcpkgs/qt5-webkit/patches/musl-ppc.patch b/srcpkgs/qt5-webkit/patches/musl-ppc.patch
new file mode 100644
index 00000000000..21d3017397e
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/musl-ppc.patch
@@ -0,0 +1,14 @@
+--- Source/JavaScriptCore/heap/MachineStackMarker.cpp
++++ Source/JavaScriptCore/heap/MachineStackMarker.cpp
+@@ -87,7 +87,11 @@ static void pthreadSignalHandlerSuspendResume(int, siginfo_t*, void* ucontext)
+ 
+     ucontext_t* userContext = static_cast<ucontext_t*>(ucontext);
+ #if CPU(PPC)
++# if defined(__GLIBC__)
+     thread->suspendedMachineContext = *userContext->uc_mcontext.uc_regs;
++# else
++    thread->suspendedMachineContext = *userContext->uc_regs;
++# endif
+ #else
+     thread->suspendedMachineContext = userContext->uc_mcontext;
+ #endif
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index fefc8261ade..004d63757e6 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -27,6 +27,11 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/ruby-*"
 fi
 
+# reduce memory footprint when linking
+if [ "$XBPS_WORDSIZE" -eq 32 ]; then
+	nodebug=yes
+fi
+
 case "$XBPS_TARGET_MACHINE" in
 	armv6*)	# Need libatomic for __atomic_fetch_add_8 etc.
 		makedepends+=" libatomic-devel"
@@ -35,9 +40,6 @@ case "$XBPS_TARGET_MACHINE" in
 	ppc64*)	# no JIT on ppc64 and other build workarounds
 		configure_args+=" -DENABLE_JIT=OFF -DUSE_SYSTEM_MALLOC=ON"
 		;;
-	i686*)  # try to reduce memory footprint when linking
-		nodebug=1
-		;;
 	ppc*)   # no JIT on ppc and need libatomic
 		configure_args+=" -DENABLE_JIT=OFF -DUSE_SYSTEM_MALLOC=ON"
 		makedepends+=" libatomic-devel"