[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/11: gnu: classpath-jamvm-wrappers: Use classpath-0.99.
From: |
Ricardo Wurmus |
Subject: |
09/11: gnu: classpath-jamvm-wrappers: Use classpath-0.99. |
Date: |
Sun, 25 Mar 2018 15:42:41 -0400 (EDT) |
rekado pushed a commit to branch rhel6
in repository guix.
commit 091e2ad6bb5cd7724c68ab1a7c740d0326e76dc7
Author: Ricardo Wurmus <address@hidden>
Date: Sun Mar 25 21:14:44 2018 +0200
gnu: classpath-jamvm-wrappers: Use classpath-0.99.
* gnu/packages/java.scm (classpath-jamvm-wrappers): Inherit from
classpath-0.99.
[native-inputs]: Replace "jamvm-bootstrap" with "jamvm-1-bootstrap"; replace
"classpath-on-sablevm" with "classpath-0.99".
---
gnu/packages/java.scm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 6f6398b..ccf9fb2 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -544,10 +544,10 @@ the standard javac executable.")))
("libltdl" ,libltdl)
("pkg-config" ,pkg-config)))))
-;; We need this because the tools provided by the latest release of GNU
-;; Classpath don't actually work with sablevm.
+;; We need this because classpath-bootstrap does not provide all of the tools
+;; we need to build classpath-devel.
(define classpath-jamvm-wrappers
- (package (inherit classpath-on-sablevm)
+ (package (inherit classpath-0.99)
(name "classpath-jamvm-wrappers")
(source #f)
(build-system trivial-build-system)
@@ -581,8 +581,8 @@ gnu.classpath.tools.~a.~a $@"
#t))))
(native-inputs
`(("bash" ,bash)
- ("jamvm" ,jamvm-bootstrap)
- ("classpath" ,classpath-on-sablevm)))
+ ("jamvm" ,jamvm-1-bootstrap)
+ ("classpath" ,classpath-0.99)))
(inputs '())
(synopsis "Executables from GNU Classpath")
(description "This package provides wrappers around the tools provided by
- branch rhel6 updated (de9ceb4 -> 208a1d9), Ricardo Wurmus, 2018/03/25
- 02/11: gnu: Add jamvm-1-bootstrap., Ricardo Wurmus, 2018/03/25
- 03/11: gnu: ant-bootstrap: Build with JamVM 1.5.1., Ricardo Wurmus, 2018/03/25
- 04/11: gnu: ant-bootstrap: Update to 1.8.4., Ricardo Wurmus, 2018/03/25
- 06/11: gnu: ecj-javac-wrapper: Do not use sablevm., Ricardo Wurmus, 2018/03/25
- 01/11: gnu: Add classpath-bootstrap., Ricardo Wurmus, 2018/03/25
- 05/11: gnu: ecj-bootstrap: Build with JamVM 1.5.1 and jikes., Ricardo Wurmus, 2018/03/25
- 08/11: gnu: Remove jamvm-bootstrap., Ricardo Wurmus, 2018/03/25
- 09/11: gnu: classpath-jamvm-wrappers: Use classpath-0.99.,
Ricardo Wurmus <=
- 07/11: gnu: Replace classpath-on-sablevm with classpath-0.99., Ricardo Wurmus, 2018/03/25
- 11/11: gnu: Remove sablevm and sablevm-classpath, update comments., Ricardo Wurmus, 2018/03/25
- 10/11: gnu: Remove ecj-javac-on-jamvm-wrapper., Ricardo Wurmus, 2018/03/25