From fc37b4afb29095e222f7ddd3fb3df1ad196926a3 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Fri, 4 Oct 2019 10:35:22 +0200
Subject: gnu: jamvm-1-bootstrap: Fix segfault in bootstrap JVM.

* gnu/packages/java.scm (jamvm-1-bootstrap)[arguments]: Add configure flags:
--disable-int-caching, --enable-runtime-reloc-checks, and --enable-ffi.
[inputs]: Add libffi.
---
 gnu/packages/java.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'gnu/packages/java.scm')

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 6090dcd514..aa624b4c28 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -186,10 +186,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)))
     (home-page "http://jamvm.sourceforge.net/")
     (synopsis "Small Java Virtual Machine")
-- 
cgit v1.2.3


From 1b6f99ea538d767099596860017e67755c1ac42f Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Fri, 4 Oct 2019 10:36:29 +0200
Subject: gnu: icedtea-7: Fix build on i686-linux.

* gnu/packages/java.scm (icedtea-7)[arguments]: Use "i386" lib directory when
the system is "i686-linux".
---
 gnu/packages/java.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'gnu/packages/java.scm')

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index aa624b4c28..3b7404973a 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1376,7 +1376,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))
-- 
cgit v1.2.3