diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-07-30 08:46:07 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-07-30 08:46:42 +0200 |
| commit | 4eca7833ef0b16fb3cdda138e3ee1e5824c36e41 (patch) | |
| tree | a87586e931bd51f2e87d07b5fbdd83bce0ccaacd /gnu/packages/java.scm | |
| parent | 4c204d01d57ac7da11a5772d5d4e3254d1c2408f (diff) | |
| parent | 6a2b5c66bf57bd1bbc6300e1f99e16e65f2478e8 (diff) | |
Merge branch 'master' into gnome-team
Diffstat (limited to 'gnu/packages/java.scm')
| -rw-r--r-- | gnu/packages/java.scm | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 7ad1116527..dd6c549a25 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -884,6 +884,18 @@ new Date();")) #: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 (lambda _ ;; This file was "fixed" by patch-source-shebangs, but it requires |