me/guix
Archived
1
0
Fork 0
Code Activity

gnu: openjdk-12: Fix building on aarch64-linux.

Browse source 
* 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:
Efraim Flashner 2023-10-06 16:16:27 +03:00
parent 8d27ef1ed3
commit a7e6b4c98b
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
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

@ -1463,6 +1463,18 @@ new Date();"))
(substitute-keyword-arguments (package-arguments openjdk11) (substitute-keyword-arguments (package-arguments openjdk11)
((#:phases phases) ((#:phases phases)
#~(modify-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 (replace 'fix-java-shebangs
(lambda _ (lambda _
;; 'blocked' was renamed to 'blacklisted' in this version for ;; 'blocked' was renamed to 'blacklisted' in this version for