[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: gnu: gcc-5.1, gcc-toolchain-5.1, libstdc++-doc-5.1: Rename to *-5
From: |
Mark H. Weaver |
Subject: |
01/02: gnu: gcc-5.1, gcc-toolchain-5.1, libstdc++-doc-5.1: Rename to *-5. |
Date: |
Mon, 20 Jul 2015 03:20:47 +0000 |
mhw pushed a commit to branch master
in repository guix.
commit 629f4d2e6e04ce831a5b2c066d7a4d2d3281d3a7
Author: Mark H Weaver <address@hidden>
Date: Sun Jul 19 21:11:56 2015 -0400
gnu: gcc-5.1, gcc-toolchain-5.1, libstdc++-doc-5.1: Rename to *-5.
This reflects the new version numbering scheme for GCC 5 and up.
See <https://gcc.gnu.org/develop.html>.
* gnu/packages/gcc.scm (gcc-5.1): Rename to ...
(gcc-5): ... this.
(libstdc++-doc-5.1): Rename to ...
(libstdc++-doc-5): ... this, and use gcc-5.
* gnu/packages/commencement.scm (gcc-toolchain-5.1): Rename to ...
(gcc-toolchain-5): ... this, and use gcc-5.
* build-aux/hydra/gnu-system.scm (%core-packages): Use gcc-5.
---
build-aux/hydra/gnu-system.scm | 2 +-
gnu/packages/commencement.scm | 4 ++--
gnu/packages/gcc.scm | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm
index 556dd7a..b537aa7 100644
--- a/build-aux/hydra/gnu-system.scm
+++ b/build-aux/hydra/gnu-system.scm
@@ -101,7 +101,7 @@ SYSTEM."
;; Note: Don't put the '-final' package variants because (1) that's
;; implicit, and (2) they cannot be cross-built (due to the explicit input
;; chain.)
- (list gcc-4.8 gcc-4.9 gcc-5.1 glibc binutils
+ (list gcc-4.8 gcc-4.9 gcc-5 glibc binutils
gmp mpfr mpc coreutils findutils diffutils patch sed grep
gawk gnu-gettext hello guile-2.0 zlib gzip xz
%bootstrap-binaries-tarball
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index d3f239f..74c3f30 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -830,7 +830,7 @@ and binaries, plus debugging symbols in the 'debug'
output), and Binutils.")
(define-public gcc-toolchain-4.9
(gcc-toolchain gcc-4.9))
-(define-public gcc-toolchain-5.1
- (gcc-toolchain gcc-5.1))
+(define-public gcc-toolchain-5
+ (gcc-toolchain gcc-5))
;;; commencement.scm ends here
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index d0a9278..6d6101b 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -331,7 +331,7 @@ Go. It also includes runtime support libraries for these
languages.")
"0zmnm00d2a1hsd41g34bhvxzvxisa2l584q3p447bd91lfjv4ci3"))
(patches (list (search-patch "gcc-libvtv-runpath.patch")))))))
-(define-public gcc-5.1
+(define-public gcc-5
(package (inherit gcc-4.9)
(version "5.1.0")
(source (origin
@@ -604,8 +604,8 @@ using compilers other than GCC."
(define-public libstdc++-doc-4.9
(make-libstdc++-doc gcc-4.9))
-(define-public libstdc++-doc-5.1
- (make-libstdc++-doc gcc-5.1))
+(define-public libstdc++-doc-5
+ (make-libstdc++-doc gcc-5))
(define-public isl
(package