Hi Guix,
this commit message is a bit hairy. Instead of just updating gcj-4.8 to
the latest version (4.9) I also made it inherit from our default “gcc”
and renamed it to just “gcj”. Likewise, “ecj-bootstrap-4.8” is updated
to version 4.9 and renamed to just “ecj-bootstrap”.
The “gcj-4.8” package predates our use of a default “gcc” variable.
The same patch also updates the two packages that used “gcj-4.8” as an
input.
“ecj-bootstrap-4.8” appears to be broken on mips64el and armhf (using it
to bootstrap GCJ results in a broken GCJ on these platforms), and I’m
hoping that the situation is different for the 4.9 release.
~~ Ricardo
>From 7bc6689ce482df255e9a1fb372736ad0059ebc2a Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wur...@mdc-berlin.de>
Date: Mon, 12 Oct 2015 10:36:27 +0200
Subject: [PATCH] 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.
---
gnu/packages/gcc.scm | 18 +++++++++---------
gnu/packages/java.scm | 2 +-
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 d2652ae..7e4f18b 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 9304a92..9e632f3 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 78310ed..9e767f0 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -587,7 +587,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")
--
2.1.0
