gnu: javacc: Bootstrap from javacc-4 instead of bootstrap binary.
* gnu/packages/java.scm (javacc)[source](snippet): Delete bootstrap binary. [arguments]: Set 'bootstrap-jar' path. [native-inputs]: Add 'javacc-4'.
This commit is contained in:
		
							parent
							
								
									6662d65f96
								
							
						
					
					
						commit
						33428d1267
					
				
					 1 changed files with 11 additions and 3 deletions
				
			
		| 
						 | 
					@ -2010,12 +2010,20 @@ debugging, etc.")
 | 
				
			||||||
                "111xc9mnmc5a6qz6x3xbhqc07y1lg2b996ggzw0hrblg42zya9xf"))
 | 
					                "111xc9mnmc5a6qz6x3xbhqc07y1lg2b996ggzw0hrblg42zya9xf"))
 | 
				
			||||||
              (modules '((guix build utils)))
 | 
					              (modules '((guix build utils)))
 | 
				
			||||||
              ;; delete bundled jars
 | 
					              ;; delete bundled jars
 | 
				
			||||||
              (snippet '(begin (delete-file-recursively "lib") #t))))
 | 
					              (snippet '(begin (for-each delete-file-recursively
 | 
				
			||||||
 | 
					                                         '("bootstrap" "lib"))
 | 
				
			||||||
 | 
					                               #t))))
 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
     `(#:test-target "test"
 | 
					     `(#:make-flags ; bootstrap from javacc-4
 | 
				
			||||||
 | 
					       (list (string-append "-Dbootstrap-jar="
 | 
				
			||||||
 | 
					                            (assoc-ref %build-inputs "javacc")
 | 
				
			||||||
 | 
					                            "/share/java/javacc.jar"))
 | 
				
			||||||
 | 
					       #:test-target "test"
 | 
				
			||||||
       #:phases
 | 
					       #:phases
 | 
				
			||||||
       (modify-phases %standard-phases
 | 
					       (modify-phases %standard-phases
 | 
				
			||||||
         (replace 'install (install-jars "target")))))))
 | 
					         (replace 'install (install-jars "target")))))
 | 
				
			||||||
 | 
					    (native-inputs
 | 
				
			||||||
 | 
					     `(("javacc" ,javacc-4)))))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
;; This is the last 3.x release of ECJ
 | 
					;; This is the last 3.x release of ECJ
 | 
				
			||||||
(define-public java-ecj-3
 | 
					(define-public java-ecj-3
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue