diff options
| author | Simon South <simon@simonsouth.net> | 2020-06-10 11:03:39 -0400 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-06-22 23:52:55 +0200 |
| commit | a212006048b14dc8614010a16db5bc6585dbf699 (patch) | |
| tree | 51706334e055494be414d4290e490f8e19b59b20 /gnu/packages/java.scm | |
| parent | cf66096d51de78c6e46c55d81d654d9941a5bc4c (diff) | |
| download | guix-a212006048b14dc8614010a16db5bc6585dbf699.tar guix-a212006048b14dc8614010a16db5bc6585dbf699.tar.gz | |
gnu: jamvm: Fix to work with current gcc and glibc.
* gnu/packages/java.scm (jamvm)[source]: Add patch.
(jamvm-1-bootstrap)[native-inputs]: Remove.
* gnu/packages/patches/jamvm-2.0.0-disable-branch-patching.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
Signed-off-by: Marius Bakke <marius@gnu.org>
Diffstat (limited to 'gnu/packages/java.scm')
| -rw-r--r-- | gnu/packages/java.scm | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d5bc713c70..cfe67d5688 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -54,7 +54,6 @@ #:use-module (gnu packages fontutils) #:use-module (gnu packages gawk) #:use-module (gnu packages gettext) - #:use-module (gnu packages gcc) #:use-module (gnu packages gl) #:use-module (gnu packages ghostscript) ;lcms #:use-module (gnu packages gnome) @@ -254,11 +253,6 @@ language.") ("libffi" ,libffi) ("zip" ,zip) ("zlib" ,zlib))) - ;; When built with a recent GCC and glibc the configure step of icedtea-6 - ;; fails with an invalid instruction error. - (native-inputs - `(("gcc" ,gcc-5) - ("libc" ,glibc-2.28))) (home-page "http://jamvm.sourceforge.net/") (synopsis "Small Java Virtual Machine") (description "JamVM is a Java Virtual Machine conforming to the JVM @@ -708,6 +702,8 @@ machine."))) (sha256 (base32 "1nl0zxz8y5x8gwsrm7n32bry4dx8x70p8z3s9jbdvs8avyb8whkn")) + (patches + (search-patches "jamvm-2.0.0-disable-branch-patching.patch")) (snippet '(begin ;; Remove precompiled software. |