gcc50: Update to release version 5.1.0 => 5.1.1

Operating Systems / DragonFlyBSD - John Marino [marino.st] - 22 April 2015 14:43 UTC

Immediately after the release was tagged, another commit was added that changed the version to 5.1.1. Other than the version differing by 0.0.1, this version is identical to what the GCC just released.

###

diff --git a/contrib/gcc-5.0/README.DRAGONFLY b/contrib/gcc-5.0/README.DRAGONFLY
index 68a49ec..2ccaedc 100644
--- a/contrib/gcc-5.0/README.DRAGONFLY
+++ b/contrib/gcc-5.0/README.DRAGONFLY
@@ -1,4 +1,4 @@
-GCC-5.0.1 SNAPSHOT
+GCC-5.1.1 RELEASE
==================

Original source of man pages can be downloaded from:
diff --git a/gnu/lib/gcc50/Makefile.inc b/gnu/lib/gcc50/Makefile.inc
index fe8ce09..4fa30d7 100644
--- a/gnu/lib/gcc50/Makefile.inc
+++ b/gnu/lib/gcc50/Makefile.inc
@@ -3,11 +3,7 @@ ____:

.include "../../usr.bin/cc50/Makefile.version"

-GCCPOINTVER= ${GCCCOMPLETEVER:R}
-GCCSHORTVER= ${GCCPOINTVER:S/.//}
-GCCSHORTDATE= ${GCCDATESTAMP:S/-//g}
-
-GCCDIR= ${.CURDIR}${RELUP}/../../../../contrib/gcc-${GCCPOINTVER}
+GCCDIR= ${.CURDIR}${RELUP}/../../../../contrib/gcc-5.0
OCCDIR= ${.OBJDIR}${RELUP}/../../../usr.bin/cc${GCCSHORTVER}
CCDIR= ${.CURDIR}${RELUP}/../../../usr.bin/cc${GCCSHORTVER}

diff --git a/gnu/usr.bin/cc50/Makefile.inc b/gnu/usr.bin/cc50/Makefile.inc
index f1d518d..30c3617 100644
--- a/gnu/usr.bin/cc50/Makefile.inc
+++ b/gnu/usr.bin/cc50/Makefile.inc
@@ -12,7 +12,7 @@ FLAGS+= -DDEFAULT_TARGET_MACHINE=\"${target_machine}\"

BINDIR?= /usr/libexec/gcc${GCCSHORTVER}

-GCCDIR= ${.CURDIR}/${TOP_PREFIX}../../../../contrib/gcc-${GCCPOINTVER}
+GCCDIR= ${.CURDIR}/${TOP_PREFIX}../../../../contrib/gcc-5.0
OTOPDIR= ${.OBJDIR}/${TOP_PREFIX}..
STOPDIR= ${.CURDIR}/${TOP_PREFIX}..
OSLDIR= ${OTOPDIR}/support-libs
diff --git a/gnu/usr.bin/cc50/Makefile.version b/gnu/usr.bin/cc50/Makefile.version
index 9e287e0..7ba26b7 100644
--- a/gnu/usr.bin/cc50/Makefile.version
+++ b/gnu/usr.bin/cc50/Makefile.version
@@ -1,5 +1,11 @@
-GCCCOMPLETEVER= 5.0.1
-GCCRELEASE= Snapshot # choices are "Snapshot" or "Release"
-GCCDATESTAMP= 2015-04-17
-GCCPOINTVER= ${GCCCOMPLETEVER:R}
-GCCSHORTVER= ${GCCPOINTVER:S/.//}
+# GCC version scheme change burned us a bit.
+# We are at 5.1 (later 5.2, 5.3) but directory names stuck at 5.0
+# Similarly CCVER is gcc50, not gcc51. Its better to live with it.
+# Next time, we can use "6" instead of "60" and "6.0"
+
+GCCCOMPLETEVER= 5.1.1
+GCCRELEASE= Release # choices are "Snapshot" or "Release"
+GCCDATESTAMP= 2015-04-22
+GCCSHORTDATE= ${GCCDATESTAMP:S/-//g}
+GCCPOINTVER= 5.0
+GCCSHORTVER= 50
diff --git a/gnu/usr.bin/cc50/drivers/cc/gcc.1 b/gnu/usr.bin/cc50/drivers/cc/gcc.1
index 1282146..dcd7f14 100644
--- a/gnu/usr.bin/cc50/drivers/cc/gcc.1
+++ b/gnu/usr.bin/cc50/drivers/cc/gcc.1
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "GCC 1"
-.TH GCC 1 "2015-04-12" "gcc-5.0.1" "GNU"
+.TH GCC 1 "2015-04-22" "gcc-5.1.0" "GNU"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/gnu/usr.bin/cc50/drivers/cpp/cpp.1 b/gnu/usr.bin/cc50/drivers/cpp/cpp.1
index 33a9702..cc0583a 100644
--- a/gnu/usr.bin/cc50/drivers/cpp/cpp.1
+++ b/gnu/usr.bin/cc50/drivers/cpp/cpp.1
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "CPP 1"
-.TH CPP 1 "2015-04-12" "gcc-5.0.1" "GNU"
+.TH CPP 1 "2015-04-22" "gcc-5.1.0" "GNU"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/gnu/usr.bin/cc50/drivers/gcov/gcov.1 b/gnu/usr.bin/cc50/drivers/gcov/gcov.1
index aeb065b..143004e 100644
--- a/gnu/usr.bin/cc50/drivers/gcov/gcov.1
+++ b/gnu/usr.bin/cc50/drivers/gcov/gcov.1
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "GCOV 1"
-.TH GCOV 1 "2015-04-12" "gcc-5.0.1" "GNU"
+.TH GCOV 1 "2015-04-22" "gcc-5.1.0" "GNU"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l

c514640 gcc50: Update to release version 5.1.0 => 5.1.1
contrib/gcc-5.0/README.DRAGONFLY | 2 +-
gnu/lib/gcc50/Makefile.inc | 6 +-----
gnu/usr.bin/cc50/Makefile.inc | 2 +-
gnu/usr.bin/cc50/Makefile.version | 16 +++++++++++-----
gnu/usr.bin/cc50/drivers/cc/gcc.1 | 2 +-
gnu/usr.bin/cc50/drivers/cpp/cpp.1 | 2 +-
gnu/usr.bin/cc50/drivers/gcov/gcov.1 | 2 +-
7 files changed, 17 insertions(+), 15 deletions(-)

Upstream: gitweb.dragonflybsd.org

  • Share