guix_mirror_bot pushed a commit to branch gnome-team
in repository guix.
commit e6f1cb31dd391eae00783a67b30a718ee4e6f517
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Fri Oct 23 14:36:51 2026 +0900
gnu: openjdk13: Bootstrap from openjdk11.
* gnu/packages/java.scm (openjdk13): Bootstrap from openjdk11.
[#:phases]: Use special 'arguments' variable.
{patch-for-aarch64, fix-java-shebangs}: Import phases from openjdk12.
---
gnu/packages/java.scm | 36 +++++++++++++++++++++++++++---------
1 file changed, 27 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 9889f4b557f..05de64ca891 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1487,22 +1487,40 @@ blacklisted.certs.pem"
"#! java BlacklistedCertsConverter SHA-256\n"))))))))))
(define-public openjdk13
- (make-openjdk openjdk12 "13.0.14"
- "1v92i5rhahqkjw8mz09c9qasnxqc67ygy0y266kdmm534z0da755"
+ (make-openjdk
+ openjdk11 "13.0.14" "1v92i5rhahqkjw8mz09c9qasnxqc67ygy0y266kdmm534z0da755"
(source (origin
(inherit (package-source base))
- (patches (search-patches
"openjdk-13-classlist-reproducibility.patch"
-
"openjdk-10-jtask-reproducibility.patch"))))
+ (patches
+ (search-patches "openjdk-10-jtask-reproducibility.patch"
+ "openjdk-13-classlist-reproducibility.patch"))))
(arguments
- (substitute-keyword-arguments (package-arguments openjdk12)
+ (substitute-keyword-arguments arguments
((#:phases phases)
#~(modify-phases #$phases
+ (add-after 'unpack 'patch-for-aarch64
+ (lambda _
+ (substitute* "src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp"
+ ;; This line is duplicated, so remove both occurrences,
+ ;; then add back one occurrence by substituting a
+ ;; comment that occurs once.
+ (("using MacroAssembler::call_VM_leaf_base;") "")
+ (("Interpreter specific version of call_VM_base")
+ (string-append "Interpreter specific version of
call_VM_base\n"
+ " using
MacroAssembler::call_VM_leaf_base;")))))
(replace 'remove-timestamping
(lambda _
- (substitute*
- "src/hotspot/share/runtime/abstract_vm_version.cpp"
- (("__DATE__") "")
- (("__TIME__") ""))))))))))
+ (substitute* "src/hotspot/share/runtime/abstract_vm_version.cpp"
+ (("__DATE__") "")
+ (("__TIME__") ""))))
+ (replace 'fix-java-shebangs
+ (lambda _
+ ;; 'blocked' was renamed to 'blacklisted' in this version for
+ ;; some reason.
+ (substitute* "make/data/blacklistedcertsconverter/\
+blacklisted.certs.pem"
+ (("^#!.*")
+ "#! java BlacklistedCertsConverter SHA-256\n"))))))))))
(define-public openjdk14
(make-openjdk