[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/09: gnu: classpath-jamvm-wrappers: Fix building on armhf-linux.
From: |
Efraim Flashner |
Subject: |
04/09: gnu: classpath-jamvm-wrappers: Fix building on armhf-linux. |
Date: |
Tue, 26 Jun 2018 07:46:20 -0400 (EDT) |
efraim pushed a commit to branch staging
in repository guix.
commit e3ec1258e321c75eb98c3f687b6d62f8d8e21737
Author: Efraim Flashner <address@hidden>
Date: Tue Jun 26 12:23:07 2018 +0300
gnu: classpath-jamvm-wrappers: Fix building on armhf-linux.
* gnu/packages/java.scm (classpath-jamvm-wrappers)[arguments]: Change
the flags used in custom script for armhf-linux.
---
gnu/packages/java.scm | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index c0a7cd7..c11beff 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -531,12 +531,20 @@ the standard javac executable.")))
(for-each (lambda (tool)
(with-output-to-file (string-append bin tool)
(lambda _
- (format #t "#!~a/bin/sh
+ ,@(if (string-prefix? "armhf" (or (%current-system)
+
(%current-target-system)))
+ `((format #t "#!~a/bin/sh
+~a/bin/jamvm -Xnocompact -classpath ~a/share/classpath/tools.zip \
+gnu.classpath.tools.~a.~a $@"
+ bash jamvm classpath tool
+ (if (string=? "native2ascii" tool)
+ "Native2ASCII" "Main")))
+ `((format #t "#!~a/bin/sh
~a/bin/jamvm -Xnocompact -Xnoinlining -classpath ~a/share/classpath/tools.zip \
gnu.classpath.tools.~a.~a $@"
bash jamvm classpath tool
(if (string=? "native2ascii" tool)
- "Native2ASCII" "Main"))))
+ "Native2ASCII" "Main"))))))
(chmod (string-append bin tool) #o755))
(list "javah"
"rmic"
- branch staging updated (4dfea10 -> 4c65eb4), Efraim Flashner, 2018/06/26
- 04/09: gnu: classpath-jamvm-wrappers: Fix building on armhf-linux.,
Efraim Flashner <=
- 03/09: gnu: ecj-javac-bootstrap: Fix building on armhf-linux., Efraim Flashner, 2018/06/26
- 09/09: gnu: classpath-devel: Use INVOKE., Efraim Flashner, 2018/06/26
- 02/09: gnu: ant-bootstrap: Fix building on armhf-linux., Efraim Flashner, 2018/06/26
- 05/09: gnu: address@hidden: Use INVOKE., Efraim Flashner, 2018/06/26
- 08/09: gnu: address@hidden: Use INVOKE., Efraim Flashner, 2018/06/26
- 06/09: gnu: ant-bootstrap: Use INVOKE., Efraim Flashner, 2018/06/26
- 07/09: gnu: ecj-bootstrap: Use INVOKE., Efraim Flashner, 2018/06/26
- 01/09: gnu: address@hidden: Fix building on armhf-linux., Efraim Flashner, 2018/06/26