civodul pushed a commit to branch master
in repository guix.
commit d3e22bcc1141cd33dde7017f51058f18d428917c
Author: Ludovic Courtès <l...@gnu.org>
Date: Mon Oct 7 09:50:51 2019 +0200
gnu: icedtea-7: Support non-Intel systems.
This is a followup to 1b6f99ea538d767099596860017e67755c1ac42f.
* gnu/packages/java.scm (icedtea-7)[arguments]: In 'install-libjvm'
phase, match armhf and aarch64.
[supported-systems]: New field.
---
gnu/packages/java.scm | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 3b74049..452180e 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1377,11 +1377,17 @@ bootstrapping purposes.")
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((lib-path (string-append (assoc-ref outputs "out")
"/lib/"
+ ;; See 'INSTALL_ARCH_DIR' in
+ ;; 'configure'.
,(match (%current-system)
("i686-linux"
"i386")
("x86_64-linux"
- "amd64")))))
+ "amd64")
+ ("armhf-linux"
+ "arm")
+ ("aarch64-linux"
+ "aarch64")))))
(symlink (string-append lib-path "/server/libjvm.so")
(string-append lib-path "/libjvm.so")))
#t))
@@ -1529,6 +1535,10 @@ bootstrapping purposes.")
(description
"This package provides the Java development kit OpenJDK built with the
IcedTea build harness.")
+
+ ;; 'configure' lists "mips" and "mipsel", but not "mips64el'.
+ (supported-systems (delete "mips64el-linux" %supported-systems))
+
;; IcedTea is released under the GPL2 + Classpath exception, which is the
;; same license as both GNU Classpath and OpenJDK.
(license license:gpl2+))))
