[Git][java-team/openjfx][master] 5 commits: Adding -latomic to the linker flags on armel
Pierre Gruet (@pgt)
gitlab at salsa.debian.org
Wed Feb 12 17:58:05 GMT 2025
Pierre Gruet pushed to branch master at Debian Java Maintainers / openjfx
Commits:
451ca252 by Pierre Gruet at 2025-02-12T17:23:24+01:00
Adding -latomic to the linker flags on armel
- - - - -
3d4d21c7 by Pierre Gruet at 2025-02-12T17:24:11+01:00
Removing the patch using the gold linker as it has been removed starting from binutils 2.44
- - - - -
bdc8c6e4 by Pierre Gruet at 2025-02-12T17:25:19+01:00
Adding three Multi-Arch headers in d/control
- - - - -
df85e26d by Pierre Gruet at 2025-02-12T17:25:50+01:00
Removing leftover jar files in d/rules when using dh_auto_clean
- - - - -
5f6e7f7a by Pierre Gruet at 2025-02-12T17:26:17+01:00
Upload to unstable
- - - - -
5 changed files:
- debian/changelog
- debian/control
- debian/patches/23-webcore-linker-flags.patch → debian/patches/linker_flags_for_armel.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+openjfx (11.0.11+1-6) unstable; urgency=medium
+
+ * Team upload
+ * Adding -latomic to the linker flags on armel
+ * Removing the patch using the gold linker as it has been removed starting
+ from binutils 2.44
+ * Adding three Multi-Arch headers in d/control
+ * Removing leftover jar files in d/rules when using dh_auto_clean
+
+ -- Pierre Gruet <pgt at debian.org> Wed, 12 Feb 2025 17:25:58 +0100
+
openjfx (11.0.11+1-5) unstable; urgency=medium
* Team upload
=====================================
debian/control
=====================================
@@ -71,6 +71,7 @@ Description: JavaFX/OpenJFX - Rich client application platform for Java (Java li
Package: libopenjfx-jni
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: JavaFX/OpenJFX - Rich client application platform for Java (native libraries)
JavaFX/OpenJFX is a set of graphics and media APIs that enables Java developers
@@ -82,6 +83,7 @@ Description: JavaFX/OpenJFX - Rich client application platform for Java (native
Package: libopenjfx-java-doc
Architecture: all
Section: doc
+Multi-Arch: foreign
Depends: ${misc:Depends}
Suggests: libopenjfx-java, default-jdk-doc
Description: JavaFX/OpenJFX - Rich client application platform for Java (Javadoc)
@@ -93,6 +95,7 @@ Description: JavaFX/OpenJFX - Rich client application platform for Java (Javadoc
Package: openjfx-source
Architecture: all
+Multi-Arch: foreign
Depends: ${misc:Depends}
Description: JavaFX/OpenJFX - Rich client application platform for Java (sources)
JavaFX/OpenJFX is a set of graphics and media APIs that enables Java developers
=====================================
debian/patches/23-webcore-linker-flags.patch → debian/patches/linker_flags_for_armel.patch
=====================================
@@ -1,15 +1,18 @@
-Description: Use the gold linker with memory saving options to avoid build failures caused by lack of RAM
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: no
-Bug-Debian: https://bugs.debian.org/857464
+Description: adding -latomic so that the build can happen on Debian buildds
+ with armel
+Author: Pierre Gruet <pgt at debian.org>
+Forwarded: not-needed
+Last-Update: 2025-02-12
+
--- 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,7 @@
- set_target_properties(WebKitLegacy PROPERTIES LINK_FLAGS "-exported_symbols_list ${WEBCORE_DIR}/mapfile-macosx")
+@@ -162,6 +162,9 @@
set(WebKitLegacy_EXTERNAL_DEP "${WEBCORE_DIR}/mapfile-macosx")
elseif (UNIX)
-- set_target_properties(WebKitLegacy PROPERTIES LINK_FLAGS "-Xlinker -version-script=${WEBCORE_DIR}/mapfile-vers -Wl,--no-undefined")
-+ 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")
+ set_target_properties(WebKitLegacy PROPERTIES LINK_FLAGS "-Xlinker -version-script=${WEBCORE_DIR}/mapfile-vers -Wl,--no-undefined")
++ if (CMAKE_LIBRARY_ARCHITECTURE STREQUAL "arm-linux-gnueabi")
++ target_link_options(WebKitLegacy PUBLIC "-Wl,--push-state,--no-as-needed,-latomic,--pop-state")
++ endif()
set(WebKitLegacy_EXTERNAL_DEP "${WEBCORE_DIR}/mapfile-vers")
elseif (WIN32)
# Adds version information to jfxwebkit.dll created by Gradle build, see JDK-8166265
=====================================
debian/patches/series
=====================================
@@ -9,7 +9,6 @@ fix-arm32-build.patch
15-fix-javadoc-refererences.diff
16-reproducible-build-timestamp.patch
19-disable-webkit-sampling-profiler.patch
-#23-webcore-linker-flags.patch
24-disable-buildSrc-tests.patch
25-webkit-debug-level.patch
26-disable-webkit-jit-for-armv4.patch
@@ -24,3 +23,4 @@ webkit-217079-only-use-jumpislands-with-JIT.patch
jdk-21-compilation.patch
64-bit-time-t.patch
gcc-14.patch
+linker_flags_for_armel.patch
=====================================
debian/rules
=====================================
@@ -62,6 +62,10 @@ override_mh_install:
mh_installjar -plibopenjfx-java debian/poms/javafx-$$module.pom build/publications/javafx.$$module.jar; \
done
+execute_after_dh_auto_clean:
+ # Delete leftover jar files
+ find modules/ -name "*.jar" -type f -delete
+
POM_VERSION=11
get-orig-poms:
wget https://repo1.maven.org/maven2/org/openjfx/javafx/$(POM_VERSION)/javafx-$(POM_VERSION).pom -O debian/poms/javafx.pom
View it on GitLab: https://salsa.debian.org/java-team/openjfx/-/compare/d407113685abe898b2771a26554706944516a4b9...5f6e7f7a9ccc4cd43f7e980907a2066596eb49cd
--
View it on GitLab: https://salsa.debian.org/java-team/openjfx/-/compare/d407113685abe898b2771a26554706944516a4b9...5f6e7f7a9ccc4cd43f7e980907a2066596eb49cd
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/20250212/233f75b8/attachment.htm>
More information about the pkg-java-commits
mailing list