diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2019-10-06 22:02:20 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2019-10-06 22:02:20 +0200 |
| commit | e08902d3cbb307e1523485becbbdaf9aed56ac4a (patch) | |
| tree | ca79454c4146f37c0e0f4d354d434816928812ed /gnu/packages/java.scm | |
| parent | 1714edc3d4e8d6da1b0cdef300ae882d0885f182 (diff) | |
| parent | f58702465d0b2daab1775d29439b73b4486a108a (diff) | |
| download | guix-e08902d3cbb307e1523485becbbdaf9aed56ac4a.tar guix-e08902d3cbb307e1523485becbbdaf9aed56ac4a.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/java.scm')
| -rw-r--r-- | gnu/packages/java.scm | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index fe745a5222..495e6bbd3a 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -197,10 +197,14 @@ language.") (arguments `(#:configure-flags (list (string-append "--with-classpath-install-dir=" - (assoc-ref %build-inputs "classpath"))))) + (assoc-ref %build-inputs "classpath")) + "--disable-int-caching" + "--enable-runtime-reloc-checks" + "--enable-ffi"))) (inputs `(("classpath" ,classpath-bootstrap) ("jikes" ,jikes) + ("libffi" ,libffi) ("zlib" ,zlib))) ;; When built with a recent GCC and glibc the configure step of icedtea-6 ;; fails with an invalid instruction error. @@ -1402,7 +1406,12 @@ bootstrapping purposes.") (add-after 'install 'install-libjvm (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((lib-path (string-append (assoc-ref outputs "out") - "/lib/amd64"))) + "/lib/" + ,(match (%current-system) + ("i686-linux" + "i386") + ("x86_64-linux" + "amd64"))))) (symlink (string-append lib-path "/server/libjvm.so") (string-append lib-path "/libjvm.so"))) #t)) |