[Git][java-team/openjfx][master] 3 commits: Add patch for FTBFS on arm64 and armhf (Closes: #1021894)

[Tony Mancill (@tmancill)]

Tony Mancill pushed to branch master at Debian Java Maintainers / openjfx


Commits:
f2d3ac36 by tony mancill at 2023-07-15T20:22:53-07:00
Add patch for FTBFS on arm64 and armhf (Closes: #1021894)

Thank you to Wookey for identifying the issue and a temporary
workaround.

- - - - -
9f8d35be by tony mancill at 2023-07-15T20:26:38-07:00
Declare Build-Conflicts on libstdc++-10-dev

- - - - -
0fee10cc by tony mancill at 2023-07-15T21:21:28-07:00
Prepare changelog for upload

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/patches/series
- + debian/patches/webkit-217079-only-use-jumpislands-with-JIT.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+openjfx (11.0.11+1-3.1) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Wookey ]
+  * Apply patch from webkit #217079 so arm64 builds again
+    (Closes: #1021894)
+
+  [ tony mancill ]
+  * Declare Build-Conflicts on libstdc++-10-dev
+    (See notes in #1021894)
+
+ -- tony mancill <tmancill at debian.org>  Sat, 15 Jul 2023 20:30:26 -0700
+
 openjfx (11.0.11+1-3) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -42,6 +42,7 @@ Build-Depends: antlr4,
                x11proto-core-dev,
                x11proto-xf86vidmode-dev,
                zip
+Build-Conflicts: libstdc++-10-dev
 Standards-Version: 4.6.2
 Vcs-Git: https://salsa.debian.org/java-team/openjfx.git
 Vcs-Browser: https://salsa.debian.org/java-team/openjfx


=====================================
debian/patches/series
=====================================
@@ -20,3 +20,4 @@ no-error_deprecated-declarations.patch
 36-disable-swt-on-32bit-arch.patch
 disable-ffmpeg.patch
 38-javadoc.patch
+webkit-217079-only-use-jumpislands-with-JIT.patch


=====================================
debian/patches/webkit-217079-only-use-jumpislands-with-JIT.patch
=====================================
@@ -0,0 +1,48 @@
+Description: Fix code from Webkit to build on arm64 when JIT is disabled
+        REGRESSION(r259582): Build fails on aarch64 Linux with WebKit 2.30.1 on LLIntOffsetsExtractor.cpp.o
+        * assembler/LinkBuffer.cpp:
+        (JSC::LinkBuffer::copyCompactAndLinkCode): DOn't compile in a call to
+        dumpJITMemory if JIT is disabled; leads to a build failure.
+        * wtf/PlatformEnable.h: Only define USE_JUMP_ISLANDS if JIT is enabled.
+	This patch is a workaround rather than a proper fix. See bug discussion
+Bug:    https://bugs.webkit.org/show_bug.cgi?id=217079
+Author: Mike Gorse  <mgorse at suse.com>
+Last-Update:   2020-09-30
+
+
+
+Index: openjfx-11.0.11+1/modules/javafx.web/src/main/native/Source/WTF/wtf/PlatformEnable.h
+===================================================================
+--- openjfx-11.0.11+1.orig/modules/javafx.web/src/main/native/Source/WTF/wtf/PlatformEnable.h
++++ openjfx-11.0.11+1/modules/javafx.web/src/main/native/Source/WTF/wtf/PlatformEnable.h
+@@ -882,6 +882,6 @@
+ #error "ENABLE(WEBGL2) requires ENABLE(WEBGL)"
+ #endif
+ 
+-#if CPU(ARM64) && CPU(ADDRESS64)
++#if CPU(ARM64) && CPU(ADDRESS64) && ENABLE(JIT)
+ #define USE_JUMP_ISLANDS 1
+ #endif
+Index: openjfx-11.0.11+1/modules/javafx.web/src/main/native/Source/JavaScriptCore/assembler/LinkBuffer.cpp
+===================================================================
+--- openjfx-11.0.11+1.orig/modules/javafx.web/src/main/native/Source/JavaScriptCore/assembler/LinkBuffer.cpp
++++ openjfx-11.0.11+1/modules/javafx.web/src/main/native/Source/JavaScriptCore/assembler/LinkBuffer.cpp
+@@ -374,6 +374,7 @@ void LinkBuffer::copyCompactAndLinkCode(
+         m_executableMemory->shrink(m_size);
+     }
+ 
++#if ENABLE(JIT)
+     if (useFastJITPermissions()) {
+         ASSERT(codeOutData == outData);
+         if (UNLIKELY(Options::dumpJITMemoryPath()))
+@@ -382,6 +383,10 @@ void LinkBuffer::copyCompactAndLinkCode(
+         ASSERT(codeOutData != outData);
+         performJITMemcpy(codeOutData, outData, m_size);
+     }
++#else
++    ASSERT(codeOutData != outData);
++    performJITMemcpy(codeOutData, outData, m_size);
++#endif // ENABLE_JIT
+ 
+     jumpsToLink.clear();
+ 



View it on GitLab: https://salsa.debian.org/java-team/openjfx/-/compare/265b587acc2adc2fb30f9fcf322d384440cc7e8b...0fee10cccda239ecb3fcec9034ff513f6782a0ff

-- 
View it on GitLab: https://salsa.debian.org/java-team/openjfx/-/compare/265b587acc2adc2fb30f9fcf322d384440cc7e8b...0fee10cccda239ecb3fcec9034ff513f6782a0ff
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20230716/6c5c2efa/attachment.htm>