qt5-webkit: use nodebug on 32-bit hosts + fix ppc-musl build

[ci skip]

qt5-webkit: fix build on ppc-musl
This commit is contained in:
q66 2019-08-12 17:31:19 +02:00 committed by Helmut Pozimski
parent 63fa719a90
commit 694e3d33d5
2 changed files with 19 additions and 3 deletions

View file

@ -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

View file

@ -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"