diff options
| author | Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> | 2015-10-12 10:36:27 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> | 2015-10-13 13:45:51 +0200 |
| commit | 397dbde8fff77c31c94928d65f3c2cac85222588 (patch) | |
| tree | 9680f67598b194abfda9232e1b0b155a77d787df /gnu | |
| parent | aec05972cef03010a1ad7d1ec83780e215eb1215 (diff) | |
| download | guix-397dbde8fff77c31c94928d65f3c2cac85222588.tar.gz guix-397dbde8fff77c31c94928d65f3c2cac85222588.zip | |
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.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/gcc.scm | 18 | ||||
| -rw-r--r-- | gnu/packages/java.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/music.scm | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index d2652aef3f..7e4f18b887 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -451,27 +451,27 @@ using compilers other than GCC." (sha256 (base32 "1c3dk4z5yfj6ic2fn3lyxs27n6pmn2wy9k0r1s17lnkf1bzkrciv")))) -(define-public gcj-4.8 - (package (inherit gcc-4.8) +(define-public gcj + (package (inherit gcc) (name "gcj") (inputs `(("fastjar" ,fastjar) ("perl" ,perl) ("javac.in" ,javac.in) - ("ecj-bootstrap" ,ecj-bootstrap-4.8) - ,@(package-inputs gcc-4.8))) + ("ecj-bootstrap" ,ecj-bootstrap) + ,@(package-inputs gcc))) ;; Suppress the separate "lib" output, because otherwise the ;; "lib" and "out" outputs would refer to each other, creating ;; a cyclic dependency. <http://debbugs.gnu.org/18101> (outputs - (delete "lib" (package-outputs gcc-4.8))) + (delete "lib" (package-outputs gcc))) (arguments (substitute-keyword-arguments `(#:modules ((guix build gnu-build-system) (guix build utils) (ice-9 regex) (srfi srfi-1) (srfi srfi-26)) - ,@(package-arguments gcc-4.8)) + ,@(package-arguments gcc)) ((#:configure-flags flags) `(let ((ecj (assoc-ref %build-inputs "ecj-bootstrap"))) `("--enable-java-home" @@ -532,13 +532,13 @@ using compilers other than GCC." ".*(c\\+\\+|cpp|g\\+\\+|gcc.*)")))) #t)))))))) -(define ecj-bootstrap-4.8 +(define ecj-bootstrap (origin (method url-fetch) - (uri "ftp://sourceware.org/pub/java/ecj-4.8.jar") + (uri "ftp://sourceware.org/pub/java/ecj-4.9.jar") (sha256 (base32 - "10fpqfbdzff1zcbxzh66xc8xbij9saykcj4xzm19wk9p3n7i5zcq")))) + "1k9lgm3qamf6zy534pa2zwskr8mpiqrngbv1vw9j4y1ghrdyf1lm")))) (define-public gcc-objc-4.8 (custom-gcc gcc-4.8 "gcc-objc" '("objc"))) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 9304a92eb9..9e632f3fbf 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -578,7 +578,7 @@ build process and its dependencies, whereas Make uses Makefile format.") ("gtk" ,gtk+-2) ("fontconfig" ,fontconfig) ("freetype" ,freetype) - ("gcj" ,gcj-4.8))) + ("gcj" ,gcj))) (home-page "http://icedtea.classpath.org") (synopsis "Java development kit") (description diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 7ee6ca1164..fe8e6f129d 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -595,7 +595,7 @@ Laurens Hammond and Don Leslie.") (inputs `(("swt" ,swt))) (native-inputs - `(("gcj" ,gcj-4.8) + `(("gcj" ,gcj) ("pkg-config" ,pkg-config))) (home-page "http://tuxguitar.com.ar") (synopsis "Multitrack tablature editor and player") |