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

gnu: gcj-4.8, gcj: Update to default GCC version. 

* gnu/packages/gcc.scm (gcj-4.8): Inherit from "gcc" package and rename
  variable to...
  (gcj): ...this new variable.
  (ecj-bootstrap-4.8): Rename variable to...
  (ecj-bootstrap): ...this, updating to version 4.9.
* gnu/packages/java.scm (icedtea6)[native-inputs]: Replace "gcj-4.8"
  with "gcj".
* gnu/packages/music.scm (tuxguitar)[native-inputs]: Likewise.
This commit is contained in:
Ricardo Wurmus 2015-10-12 10:36:27 +02:00
parent aec05972ce
commit 397dbde8ff
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnu/packages/gcc.scm
View File

@ -451,27 +451,27 @@ using compilers other than GCC."
(sha256 (base32 (sha256 (base32
"1c3dk4z5yfj6ic2fn3lyxs27n6pmn2wy9k0r1s17lnkf1bzkrciv")))) "1c3dk4z5yfj6ic2fn3lyxs27n6pmn2wy9k0r1s17lnkf1bzkrciv"))))
(define-public gcj-4.8 (define-public gcj
(package (inherit gcc-4.8) (package (inherit gcc)
(name "gcj") (name "gcj")
(inputs (inputs
`(("fastjar" ,fastjar) `(("fastjar" ,fastjar)
("perl" ,perl) ("perl" ,perl)
("javac.in" ,javac.in) ("javac.in" ,javac.in)
("ecj-bootstrap" ,ecj-bootstrap-4.8) ("ecj-bootstrap" ,ecj-bootstrap)
,@(package-inputs gcc-4.8))) ,@(package-inputs gcc)))
;; Suppress the separate "lib" output, because otherwise the ;; Suppress the separate "lib" output, because otherwise the
;; "lib" and "out" outputs would refer to each other, creating ;; "lib" and "out" outputs would refer to each other, creating
;; a cyclic dependency. <http://debbugs.gnu.org/18101> ;; a cyclic dependency. <http://debbugs.gnu.org/18101>
(outputs (outputs
(delete "lib" (package-outputs gcc-4.8))) (delete "lib" (package-outputs gcc)))
(arguments (arguments
(substitute-keyword-arguments `(#:modules ((guix build gnu-build-system) (substitute-keyword-arguments `(#:modules ((guix build gnu-build-system)
(guix build utils) (guix build utils)
(ice-9 regex) (ice-9 regex)
(srfi srfi-1) (srfi srfi-1)
(srfi srfi-26)) (srfi srfi-26))
,@(package-arguments gcc-4.8)) ,@(package-arguments gcc))
((#:configure-flags flags) ((#:configure-flags flags)
`(let ((ecj (assoc-ref %build-inputs "ecj-bootstrap"))) `(let ((ecj (assoc-ref %build-inputs "ecj-bootstrap")))
`("--enable-java-home" `("--enable-java-home"
@ -532,13 +532,13 @@ using compilers other than GCC."
".*(c\\+\\+|cpp|g\\+\\+|gcc.*)")))) ".*(c\\+\\+|cpp|g\\+\\+|gcc.*)"))))
#t)))))))) #t))))))))
(define ecj-bootstrap-4.8 (define ecj-bootstrap
(origin (origin
(method url-fetch) (method url-fetch)
(uri "ftp://sourceware.org/pub/java/ecj-4.8.jar") (uri "ftp://sourceware.org/pub/java/ecj-4.9.jar")
(sha256 (sha256
(base32 (base32
"10fpqfbdzff1zcbxzh66xc8xbij9saykcj4xzm19wk9p3n7i5zcq")))) "1k9lgm3qamf6zy534pa2zwskr8mpiqrngbv1vw9j4y1ghrdyf1lm"))))
(define-public gcc-objc-4.8 (define-public gcc-objc-4.8
(custom-gcc gcc-4.8 "gcc-objc" '("objc"))) (custom-gcc gcc-4.8 "gcc-objc" '("objc")))

2
gnu/packages/java.scm
View File

@ -578,7 +578,7 @@ build process and its dependencies, whereas Make uses Makefile format.")
("gtk" ,gtk+-2) ("gtk" ,gtk+-2)
("fontconfig" ,fontconfig) ("fontconfig" ,fontconfig)
("freetype" ,freetype) ("freetype" ,freetype)
("gcj" ,gcj-4.8))) ("gcj" ,gcj)))
(home-page "http://icedtea.classpath.org") (home-page "http://icedtea.classpath.org")
(synopsis "Java development kit") (synopsis "Java development kit")
(description (description

2
gnu/packages/music.scm
View File

@ -595,7 +595,7 @@ Laurens Hammond and Don Leslie.")
(inputs (inputs
`(("swt" ,swt))) `(("swt" ,swt)))
(native-inputs (native-inputs
`(("gcj" ,gcj-4.8) `(("gcj" ,gcj)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(home-page "http://tuxguitar.com.ar") (home-page "http://tuxguitar.com.ar")
(synopsis "Multitrack tablature editor and player") (synopsis "Multitrack tablature editor and player")