amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into core-updates

Browse source
This commit is contained in:
Ludovic Courtès 2019-10-07 17:06:13 +02:00
commit 4d8d2fbaf3
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
13 changed files with 315 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/java.scm
View file

@ -1406,12 +1406,17 @@ bootstrapping purposes.")
(add-after 'install 'install-libjvm
(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")
"/lib/i386")
("x86_64-linux"
"amd64")))))
"/lib/amd64")
("armhf-linux"
"/lib/arm")
("aarch64-linux"
"/lib/aarch64")))))
(symlink (string-append lib-path "/server/libjvm.so")
(string-append lib-path "/libjvm.so")))
#t))
@ -1559,6 +1564,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+))))