me
/
guix
Archived
1
0
Fork 0
Code

gnu: openjdk9: Fix build on aarch64. 

* gnu/packages/java.scm (openjdk9)[arguments]: Add 'patch-for-aarch64 phase to
remove duplicate line in interp_masm_aarch64.hpp.

Signed-off-by: Andreas Enge <andreas@enge.fr>
Christopher Baines 2023-05-06 11:50:47 +01:00 committed by Andreas Enge
parent f22c20e7ca
commit 9ca9b0afb6
No known key found for this signature in database
GPG Key ID: F7D5C9BF765C61E3
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/java.scm
View File

@ -884,6 +884,18 @@ new Date();"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
,@(if (target-aarch64?)
`((add-after 'unpack 'patch-for-aarch64
(lambda _
(substitute* "hotspot/src/cpu/aarch64/vm/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")
"Interpreter specific version of call_VM_base
using MacroAssembler::call_VM_leaf_base;")))))
'())
(add-after 'patch-source-shebangs 'fix-java-shebangs (add-after 'patch-source-shebangs 'fix-java-shebangs
(lambda _ (lambda _
;; This file was "fixed" by patch-source-shebangs, but it requires ;; This file was "fixed" by patch-source-shebangs, but it requires