From a7e6b4c98b97921ab695218f9b89be4f1ded48c9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 6 Oct 2023 16:16:27 +0300 Subject: gnu: openjdk-12: Fix building on aarch64-linux. * gnu/packages/java.scm (openjdk-12)[arugments]: When building for aarch64-linux add a phase to remove a duplicate line. --- gnu/packages/java.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 30a59ec5a3..9445c37b67 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1463,6 +1463,18 @@ (define-public openjdk12 (substitute-keyword-arguments (package-arguments openjdk11) ((#:phases phases) #~(modify-phases #$phases + #$@(if (target-aarch64?) + #~((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 'fix-java-shebangs (lambda _ ;; 'blocked' was renamed to 'blacklisted' in this version for -- cgit v1.2.3