nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: Replace classpath-on-sablevm with classpath-0.99. 

* gnu/packages/java.scm (classpath-on-sablevm): Replace with...
(classpath-0.99): ...this new variable.
(classpath-devel): Inherit from classpath-0.99.
master
Ricardo Wurmus 2018-03-25 21:13:03 +02:00
parent c4f06c1164
commit 8778da03c8
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gnu/packages/java.scm
View File

@ -497,14 +497,11 @@ requirement for all GNU Classpath releases after version 0.93.")
compiler for Java} (ecj) with a command line interface that is compatible with compiler for Java} (ecj) with a command line interface that is compatible with
the standard javac executable."))) the standard javac executable.")))
;; Note: All the tool wrappers (e.g. for javah, javac, etc) fail with ;; The classpath-bootstrap was built without a virtual machine, so it does not
;; java.lang.UnsupportedClassVersionError. They simply won't run on the old ;; provide a wrapper for javah. We cannot build the development version of
;; sablevm. We use Classpath 0.99 to build JamVM, on which the Classpath ;; Classpath without javah.
;; tools do run. Using these Classpath tools on JamVM we can then build the (define classpath-0.99
;; development version of GNU Classpath. (package (inherit classpath-bootstrap)
(define classpath-on-sablevm
(package
(name "classpath")
(version "0.99") (version "0.99")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -513,7 +510,6 @@ the standard javac executable.")))
(sha256 (sha256
(base32 (base32
"1j7cby4k66f1nvckm48xcmh352b1d1b33qk7l6hi7dp9i9zjjagr")))) "1j7cby4k66f1nvckm48xcmh352b1d1b33qk7l6hi7dp9i9zjjagr"))))
(build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list (string-append "--with-ecj-jar=" (list (string-append "--with-ecj-jar="
@ -523,8 +519,8 @@ the standard javac executable.")))
(assoc-ref %build-inputs "ecj-javac-wrapper") (assoc-ref %build-inputs "ecj-javac-wrapper")
"/bin/javac") "/bin/javac")
(string-append "JAVA=" (string-append "JAVA="
(assoc-ref %build-inputs "sablevm") (assoc-ref %build-inputs "jamvm")
"/bin/java-sablevm") "/bin/jamvm")
"GCJ_JAVAC_TRUE=no" "GCJ_JAVAC_TRUE=no"
"ac_cv_prog_java_works=yes" ; trust me "ac_cv_prog_java_works=yes" ; trust me
"--disable-Werror" "--disable-Werror"
@ -543,17 +539,10 @@ the standard javac executable.")))
`(("ecj-bootstrap" ,ecj-bootstrap) `(("ecj-bootstrap" ,ecj-bootstrap)
("ecj-javac-wrapper" ,ecj-javac-wrapper) ("ecj-javac-wrapper" ,ecj-javac-wrapper)
("fastjar" ,fastjar) ("fastjar" ,fastjar)
("sablevm" ,sablevm) ("jamvm" ,jamvm-1-bootstrap)
("sablevm-classpath" ,sablevm-classpath) ("classpath" ,classpath-bootstrap)
("libltdl" ,libltdl) ("libltdl" ,libltdl)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))))
(home-page "https://www.gnu.org/software/classpath/")
(synopsis "Essential libraries for Java")
(description "GNU Classpath is a project to create core class libraries
for use with runtimes, compilers and tools for the Java programming
language.")
;; GPLv2 or later, with special linking exception.
(license license:gpl2+)))
(define jamvm-bootstrap (define jamvm-bootstrap
(package (package
@ -720,7 +709,7 @@ the standard javac executable. The tool runs on JamVM instead of SableVM.")))
(define-public classpath-devel (define-public classpath-devel
(let ((commit "e7c13ee0cf2005206fbec0eca677f8cf66d5a103") (let ((commit "e7c13ee0cf2005206fbec0eca677f8cf66d5a103")
(revision "1")) (revision "1"))
(package (inherit classpath-on-sablevm) (package (inherit classpath-bootstrap)
(version (string-append "0.99-" revision "." (string-take commit 9))) (version (string-append "0.99-" revision "." (string-take commit 9)))
(source (origin (source (origin
(method git-fetch) (method git-fetch)