mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 13:58:15 -05:00
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.
This commit is contained in:
parent
8d27ef1ed3
commit
a7e6b4c98b
1 changed files with 12 additions and 0 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue