XPost: linux.debian.ports.alpha, linux.debian.ports.hppa, linux.
ebian.ports.68k
XPost: linux.debian.ports.superh
From: glaubitz@physik.fu-berlin.de
This is a multi-part MIME message sent by reportbug.
Source: webkit2gtk
Version: 2.50.5-1
Severity: normal
Tags: patch
User: debian-68k@lists.debian.org
Usertags: alpha hppa m68k sh4
X-Debbugs-Cc: debian-alpha@lists.debian.org,debian-hppa@lists.de
ian.org,debian-68k@lists.debian.org,debian-superh@lists.debian.org
Hi,
the previous version of no-must-tail.patch didn't cover all cases for all
architectures, so we're still seeing FTBFS for alpha, hppa, m68k and sh4.
Thus, please update the patch with the attached version.
Thanks,
Adrian
--
.''`. John Paul Adrian Glaubitz
: :' : Debian Developer
`. `' Physicist
`- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
From: John Paul Adrian Glaubitz
Subject: Disable musttail on sh4 and m68k
Bug-Debian: https://bugs.debian.org/1125380
Index: webkit2gtk-2.50.5/Source/ThirdParty/skia/modules/skcms/sr
/skcms_internals.h
===================================================================
--- webkit2gtk-2.50.5.orig/Source/ThirdParty/skia/modules/skcms/
rc/skcms_internals.h
+++ webkit2gtk-2.50.5/Source/ThirdParty/skia/modules/skcms/src/s
cms_internals.h
@@ -52,11 +52,16 @@ extern "C" {
&& !defined(__arm__) \
&& !defined(__riscv) \
&& !defined(__powerpc__) \
+ && !defined(__alpha__) \
+ && !defined(__hppa__) \
+ && !defined(__m68k__) \
+ && !defined(__sh__) \
&& !defined(__loongarch__) \
&& !defined(_WIN32) &&
!defined(__SYMBIAN32__)
#define SKCMS_HAS_MUSTTAIL 1
#endif
- #elif !defined(__clang__) && !defined(SKCMS_HAS_MUSTTAIL)
+ #elif !defined(__clang__) && !defined(SKCMS_HAS_MUSTTAIL) &&
!defined(__alpha__) && \
+ !defined(__hppa__) && !defined(__m68k__) && !defined(__sh__)
#if __has_cpp_attribute(clang::musttail)
#define SKCMS_HAS_MUSTTAIL 1
#else
Index: webkit2gtk-2.50.5/Source/ThirdParty/skia/src/core/SkRasterPipeline.h
===================================================================
--- webkit2gtk-2.50.5.orig/Source/ThirdParty/skia/src/core/SkRasterPipeline.h
+++ webkit2gtk-2.50.5/Source/ThirdParty/skia/src/core/SkRasterPipeline.h
@@ -26,8 +26,8 @@ enum SkColorType : int;
struct SkImageInfo;
struct skcms_TransferFunction;
-#if __has_cpp_attribute(clang::musttail) && !defined(__EMSCRIPTEN__) &&
!defined(SK_CPU_ARM32) && \
- !defined(SK_CPU_LOONGARCH) && !defined(SK_CPU_PPC) && \
+#if __has_cpp_attribute(clang::musttail) && !defined(__EMSCRIPTEN__) &&
!defined(SK_CPU_ARM32) && !defined(__alpha__) && \
+ !defined(SK_CPU_LOONGARCH) && !defined(SK_CPU_PPC) && !
efined(__sh__) && !defined(__m68k__) && !defined(__hppa__) && \
!(defined(_WIN32) && defined(SK_BUILD_FOR_ANDROID_FRAMEWORK))
// [[clang::musttail]] is disabled for the Android version of Skia
running on Windows as it
// causes crashes (This is probably related to http://crbug.com/1505442).
--- SoupGate-Win32 v1.05
* Origin: you cannot sedate... all the things you hate (1:229/2)
|
