nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: icedtea-7: Support non-Intel systems. 

This is a followup to 1b6f99ea53.

* gnu/packages/java.scm (icedtea-7)[arguments]: In 'install-libjvm'
phase, match armhf and aarch64.
[supported-systems]: New field.
This commit is contained in:
Ludovic Courtès 2019-10-07 09:50:51 +02:00
parent 4261a9d162
commit d3e22bcc11
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/java.scm
View File

@ -1377,11 +1377,17 @@ bootstrapping purposes.")
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((lib-path (string-append (assoc-ref outputs "out") (let* ((lib-path (string-append (assoc-ref outputs "out")
"/lib/" "/lib/"
;; See 'INSTALL_ARCH_DIR' in
;; 'configure'.
,(match (%current-system) ,(match (%current-system)
("i686-linux" ("i686-linux"
"i386") "i386")
("x86_64-linux" ("x86_64-linux"
"amd64"))))) "amd64")
("armhf-linux"
"arm")
("aarch64-linux"
"aarch64")))))
(symlink (string-append lib-path "/server/libjvm.so") (symlink (string-append lib-path "/server/libjvm.so")
(string-append lib-path "/libjvm.so"))) (string-append lib-path "/libjvm.so")))
#t)) #t))
@ -1529,6 +1535,10 @@ bootstrapping purposes.")
(description (description
"This package provides the Java development kit OpenJDK built with the "This package provides the Java development kit OpenJDK built with the
IcedTea build harness.") 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 ;; IcedTea is released under the GPL2 + Classpath exception, which is the
;; same license as both GNU Classpath and OpenJDK. ;; same license as both GNU Classpath and OpenJDK.
(license license:gpl2+)))) (license license:gpl2+))))