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".
master
Ricardo Wurmus 2018-03-25 21:14:44 +02:00
parent 58d2b13544
commit c98d7a66cc
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 5 additions and 5 deletions

View File

@ -544,10 +544,10 @@ the standard javac executable.")))
("libltdl" ,libltdl) ("libltdl" ,libltdl)
("pkg-config" ,pkg-config))))) ("pkg-config" ,pkg-config)))))
;; We need this because the tools provided by the latest release of GNU ;; We need this because classpath-bootstrap does not provide all of the tools
;; Classpath don't actually work with sablevm. ;; we need to build classpath-devel.
(define classpath-jamvm-wrappers (define classpath-jamvm-wrappers
(package (inherit classpath-on-sablevm) (package (inherit classpath-0.99)
(name "classpath-jamvm-wrappers") (name "classpath-jamvm-wrappers")
(source #f) (source #f)
(build-system trivial-build-system) (build-system trivial-build-system)
@ -581,8 +581,8 @@ gnu.classpath.tools.~a.~a $@"
#t)))) #t))))
(native-inputs (native-inputs
`(("bash" ,bash) `(("bash" ,bash)
("jamvm" ,jamvm-bootstrap) ("jamvm" ,jamvm-1-bootstrap)
("classpath" ,classpath-on-sablevm))) ("classpath" ,classpath-0.99)))
(inputs '()) (inputs '())
(synopsis "Executables from GNU Classpath") (synopsis "Executables from GNU Classpath")
(description "This package provides wrappers around the tools provided by (description "This package provides wrappers around the tools provided by