Ricardo Wurmus <
address@hidden> ezt írta (időpont: 2019. okt. 1., Ke 3:02):
Ricardo Wurmus <address@hidden> writes:
> Hi Gábor,
>
>> The attached patch also works for me. Can you check?
>
> I just noticed that this is not enough for me to build
> classpath-0.99-1.e7c13ee0c. ant-bootstrap builds fine but Classpath
> fails. (This is with --system=i686-linux.)
>
> I haven’t tried to build all the way to the final JDK with my previous
> patch yet.
I can build up to the first icedtea package with this patch, whereas the
reduced patch leads to a failure to build classpath.
--8<---------------cut here---------------start------------->8---
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 403c446a82..597bd8733b 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -186,10 +186,15 @@ 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"
+ "--disable-int-inlining"
+ "--enable-ffi")))
(inputs
`(("classpath" ,classpath-bootstrap)
("jikes" ,jikes)
+ ("libffi" ,libffi)
("zlib" ,zlib)))
(home-page "http://jamvm.sourceforge.net/")
(synopsis "Small Java Virtual Machine")
@@ -258,7 +263,7 @@ JNI.")
,@(if (string-prefix? "armhf" (or (%current-system)
(%current-target-system)))
`((string-append m "-Xnocompact "))
- `((string-append m "-Xnocompact -Xnoinlining ")))))
+ `((string-append m "-Xnocompact ")))))
;; Disable tests because we are bootstrapping and thus don't have
;; any of the dependencies required to build and run the tests.
@@ -537,7 +542,7 @@ gnu.classpath.tools.~a.~a $@"
(if (string=? "native2ascii" tool)
"Native2ASCII" "Main")))
`((format #t "#!~a/bin/sh
-~a/bin/jamvm -Xnocompact -Xnoinlining -classpath ~a/share/classpath/tools.zip \
+~a/bin/jamvm -Xnocompact -classpath ~a/share/classpath/tools.zip \
gnu.classpath.tools.~a.~a $@"
bash jamvm classpath tool
(if (string=? "native2ascii" tool)
--8<---------------cut here---------------end--------------->8---
I would like to push this. Not sure if just to core-updates or to
master as well, because Java on i686-linux is currently broken on
master.
I did not check this yet, but it looks good to me. I will have a look later, but you can push this. If I find anything we can reduce this in staging.