Bug#1088786: openjfx: fix ftbfs on riscv64

[Bo YU]

Source: openjfx
Version: 11.0.11+1-4
Severity: important
Tags: ftbfs patch
User: debian-riscv at lists.debian.org
Usertags: riscv64
X-Debbugs-Cc: debian-riscv at lists.debian.org

Dear Maintainer,

Openjfx always has ftbfs issue in the past:

```
...
[100%] Linking CXX shared library ../../lib/libjfxwebkit.so
collect2: fatal error: cannot find ‘ld’
compilation terminated.
...
```

See :
https://buildd.debian.org/status/fetch.php?pkg=openjfx&arch=riscv64&ver=11.0.11%2B1-4&stamp=1731359861&raw=0

The patch attched is to use bfd again and the build is okay on my local
Unmachted abords.

But I am not satisfied with the soultion because this is not the first
time to see glod issue on here, see [0] also. However this should be
time-consuming task for me to reproduce the issue in the scenario of
openjfx, so personally I hope we can built it on riscv64 first then
waiting a root cause fixed solution.

Could you have a look at this? thanks!

[0]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1080206#5


-- 
Regards,
--
  Bo YU

-------------- next part --------------
diff -Nru openjfx-11.0.11+1/debian/changelog openjfx-11.0.11+1/debian/changelog
--- openjfx-11.0.11+1/debian/changelog	2024-11-11 14:02:46.000000000 +0000
+++ openjfx-11.0.11+1/debian/changelog	2024-12-01 02:05:58.000000000 +0000
@@ -1,3 +1,10 @@
+openjfx (11.0.11+1-4.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix ftbfs on riscv64. (Closes: #-1)
+
+ -- Bo YU <tsu.yubo at gmail.com>  Sun, 01 Dec 2024 02:05:58 +0000
+
 openjfx (11.0.11+1-4) unstable; urgency=medium
 
   * Team upload
diff -Nru openjfx-11.0.11+1/debian/patches/riscv64-use-bfd.patch openjfx-11.0.11+1/debian/patches/riscv64-use-bfd.patch
--- openjfx-11.0.11+1/debian/patches/riscv64-use-bfd.patch	1970-01-01 00:00:00.000000000 +0000
+++ openjfx-11.0.11+1/debian/patches/riscv64-use-bfd.patch	2024-12-01 01:52:02.000000000 +0000
@@ -0,0 +1,30 @@
+Description: fix ftbfs on riscv64
+ Due to unknown reason, using gold does not work on riscv64:
+ '''
+ [100%] Linking CXX shared library ../../lib/libjfxwebkit.so
+ collect2: fatal error: cannot find ‘ld’
+ compilation terminated.
+ '''
+ see: https://buildd.debian.org/status/fetch.php?pkg=openjfx&arch=riscv64&ver=11.0.11%2B1-4&stamp=1731359861&raw=0
+Author: Bo YU <tsu.yubo at gmail.com>
+Forwarded: not-needed
+Last-Update: 2024-12-01
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: b/modules/javafx.web/src/main/native/Source/WebKitLegacy/PlatformJava.cmake
+===================================================================
+--- a/modules/javafx.web/src/main/native/Source/WebKitLegacy/PlatformJava.cmake
++++ b/modules/javafx.web/src/main/native/Source/WebKitLegacy/PlatformJava.cmake
+@@ -161,7 +161,11 @@
+     set_target_properties(WebKitLegacy PROPERTIES LINK_FLAGS "-exported_symbols_list ${WEBCORE_DIR}/mapfile-macosx")
+     set(WebKitLegacy_EXTERNAL_DEP "${WEBCORE_DIR}/mapfile-macosx")
+ elseif (UNIX)
+-    set_target_properties(WebKitLegacy PROPERTIES LINK_FLAGS "-Xlinker -version-script=${WEBCORE_DIR}/mapfile-vers -fuse-ld=gold -Wl,--no-undefined -Wl,--no-keep-memory -Wl,--no-map-whole-files -Wl,--no-keep-files-mapped")
++    if(CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64")
++        set_target_properties(WebKitLegacy PROPERTIES LINK_FLAGS "-Xlinker -version-script=${WEBCORE_DIR}/mapfile-vers -fuse-ld=bfd -Wl,--no-undefined -Wl,--no-keep-memory -Wl,--no-map-whole-files")
++    else()
++        set_target_properties(WebKitLegacy PROPERTIES LINK_FLAGS "-Xlinker -version-script=${WEBCORE_DIR}/mapfile-vers -fuse-ld=gold -Wl,--no-undefined -Wl,--no-keep-memory -Wl,--no-map-whole-files -Wl,--no-keep-files-mapped")
++    endif()
+     set(WebKitLegacy_EXTERNAL_DEP "${WEBCORE_DIR}/mapfile-vers")
+ elseif (WIN32)
+     # Adds version information to jfxwebkit.dll created by Gradle build, see JDK-8166265
diff -Nru openjfx-11.0.11+1/debian/patches/series openjfx-11.0.11+1/debian/patches/series
--- openjfx-11.0.11+1/debian/patches/series	2024-11-04 21:49:56.000000000 +0000
+++ openjfx-11.0.11+1/debian/patches/series	2024-11-29 23:01:57.000000000 +0000
@@ -24,3 +24,4 @@
 jdk-21-compilation.patch
 64-bit-time-t.patch
 gcc-14.patch
+riscv64-use-bfd.patch
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-maintainers/attachments/20241201/9096337a/attachment.sig>