Bug#1042519: webkit2gtk: Please update CFLAGS for sh4 to fix FTBFS

[John Paul Adrian Glaubitz]

Source: webkit2gtk
Version: 2.40.4-1
Severity: normal
Tags: patch
User: debian-superh at lists.debian.org
Usertags: sh4
X-Debbugs-Cc: debian-superh at lists.debian.org

Hello!

The current CFLAGS result in webkit2gtk FTBFS due to a GCC internal compiler error [1]:

In file included from /<<PKGBUILDDIR>>/Source/JavaScriptCore/inspector/InjectedScriptHost.cpp:29,
                 from JavaScriptCore/DerivedSources/unified-sources/UnifiedSource-84c9f43f-1.cpp:7:
/<<PKGBUILDDIR>>/Source/JavaScriptCore/inspector/JSInjectedScriptHost.h: In static member function ‘static JSC::Structure* Inspector::JSInjectedScriptHost::createStructure(JSC::VM&, JSC::JSGlobalObject*, JSC::JSValue)’:
/<<PKGBUILDDIR>>/Source/JavaScriptCore/inspector/JSInjectedScriptHost.h:51:5: error: unable to find a register to spill in class ‘R0_REGS’

This is fixed by building webkit2gtk with "-O1" instead of "-Os" which used to be the
case before but was changed in order to reduce memory usage during build [2]. However,
on sh4, we need to keep "-O1" to make the register allocator happy.

Could you apply the following change:

--- old/webkit2gtk-2.40.4/debian/rules  2023-07-06 11:51:25.000000000 +0200
+++ new/webkit2gtk-2.40.4/debian/rules  2023-07-29 18:44:00.495509999 +0200
@@ -71,7 +71,7 @@
 endif
 
 # Lower memory requirements on architectures with only 2 GB address space
-ifneq (,$(filter $(DEB_HOST_ARCH),m68k mips mipsel sh4))
+ifneq (,$(filter $(DEB_HOST_ARCH),m68k mips mipsel))
        CFLAGS := $(CFLAGS:-g1=-g0)
        CFLAGS := $(CFLAGS:-O2=-Os)
        CPPFLAGS += --param ggc-min-expand=10
@@ -80,7 +80,9 @@
 # See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93876
 # and: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93877
 ifneq (,$(filter $(DEB_HOST_ARCH),sh3 sh4))
+       CFLAGS := $(CFLAGS:-g1=-g0)
        CFLAGS := $(CFLAGS:-O2=-O1)
+       CPPFLAGS += --param ggc-min-expand=10
 endif
 
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))

Thanks,
Adrian

> [1] https://buildd.debian.org/status/fetch.php?pkg=webkit2gtk&arch=sh4&ver=2.41.4-1&stamp=1684382877&raw=0
> [2] https://salsa.debian.org/webkit-team/webkit/-/commit/3160dec4b3500e97418dbd4246481dc1ae0d2c37

--
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer
`. `'   Physicist
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913
-------------- next part --------------
--- old/webkit2gtk-2.40.4/debian/rules	2023-07-06 11:51:25.000000000 +0200
+++ new/webkit2gtk-2.40.4/debian/rules	2023-07-29 18:44:00.495509999 +0200
@@ -71,7 +71,7 @@
 endif
 
 # Lower memory requirements on architectures with only 2 GB address space
-ifneq (,$(filter $(DEB_HOST_ARCH),m68k mips mipsel sh4))
+ifneq (,$(filter $(DEB_HOST_ARCH),m68k mips mipsel))
 	CFLAGS := $(CFLAGS:-g1=-g0)
 	CFLAGS := $(CFLAGS:-O2=-Os)
 	CPPFLAGS += --param ggc-min-expand=10
@@ -80,7 +80,9 @@
 # See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93876
 # and: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93877
 ifneq (,$(filter $(DEB_HOST_ARCH),sh3 sh4))
+	CFLAGS := $(CFLAGS:-g1=-g0)
 	CFLAGS := $(CFLAGS:-O2=-O1)
+	CPPFLAGS += --param ggc-min-expand=10
 endif
 
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))