Attachment 186653 Details for Bug 221883 – New patch updated after last commit

[patch] New patch updated after last commit

gcc6-aux-20170802_2.diff (text/plain), 2.90 KB, created by frederic.praca on 2017-09-24 07:47:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: frederic.praca

Created: 2017-09-24 07:47:39 UTC

Size: 2.90 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 450480)
>+++ Makefile	(working copy)
>@@ -7,7 +7,7 @@
> CATEGORIES=	lang
> MASTER_SITES=	http://downloads.dragonlace.net/src/:boot \
> 		LOCAL/marino:boot GCC/${MS_SUBDIR}
>-DISTFILES=	${IDENTIFICATION}.tar.bz2
>+DISTFILES=	${IDENTIFICATION}.tar.xz
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Version of GCC ${GCC_BRANCH} with full Ada support
>@@ -83,9 +83,11 @@
> PKG_PREFIX=		${PREFIX}/${PORTNAME}
> MANPREFIX=		${PREFIX}/${PORTNAME}/share
> BSFILENAME=		ada-bootstrap.${GARCH}.${OPSYS:tl}.${OSREL:S/.//}.tar.bz2
>+GMAKE_DIRECTORY!=	dirname `which gmake`
> 
> # If we find gnatmake and friends in a standard location, then we'll use this
> # compiler instead of downloading the bootstrap.
>+# Add /usr/local/bin for gmake
> .if exists (${LOCALBASE}/${PORTNAME}/bin/ada)
> .if exists (${LOCALBASE}/${PORTNAME}/bin/gnatbind)
> .if exists (${LOCALBASE}/${PORTNAME}/bin/gnatlink)
>@@ -92,7 +94,7 @@
> .if exists (${LOCALBASE}/${PORTNAME}/bin/gnatmake)
> FULL_GNATGCC=${LOCALBASE}/${PORTNAME}/bin/ada
> FULL_GNATGXX=${LOCALBASE}/${PORTNAME}/bin/g++
>-FULL_PATH=/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/${PORTNAME}/bin:${PREFIX}/bin
>+FULL_PATH=/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/${PORTNAME}/bin:${PREFIX}/bin:${GMAKE_DIRECTORY}
> .endif
> .endif
> .endif
>@@ -99,11 +101,12 @@
> .endif
> 
> # If FULL_GNATGCC is not set, we'll request the bootstrap compiler
>+# Add /usr/local/bin for gmake
> .if ${FULL_GNATGCC} == NOT_SET
> INTENDED_COMPILER=BOOTSTRAP
> FULL_GNATGCC=${BOOTSTRAP_PREFIX}/bin/gcc
> FULL_GNATGXX=${BOOTSTRAP_PREFIX}/bin/g++
>-FULL_PATH=${BOOTSTRAP_PREFIX}/bin:/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/bin
>+FULL_PATH=${BOOTSTRAP_PREFIX}/bin:/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/bin:${GMAKE_DIRECTORY}
> DISTFILES+=	${BOOTSTRAP_COMPILER}:boot
> .endif
> 
>Index: Makefile.version
>===================================================================
>--- Makefile.version	(revision 450480)
>+++ Makefile.version	(working copy)
>@@ -3,7 +3,7 @@
> GCC_BRANCH=		6
> GCC_POINT=		3.1
> GCC_VERSION=		${GCC_BRANCH}.${GCC_POINT}
>-SNAPSHOT=		20170202
>+SNAPSHOT=		20170802
> BUILD_RELEASE=		no
> MAIN_PR=		2
> UTIL_PR=		0
>Index: distinfo
>===================================================================
>--- distinfo	(revision 450480)
>+++ distinfo	(working copy)
>@@ -1,6 +1,6 @@
>-TIMESTAMP = 1486228714
>-SHA256 (gcc-6-20170202.tar.bz2) = 339411f9ec780ba1f779417ea2a3206b69ee11de293aea27fff4658d7e56d0c5
>-SIZE (gcc-6-20170202.tar.bz2) = 95743873
>+TIMESTAMP = 1503523153
>+SHA256 (gcc-6-20170802.tar.xz) = 6da53170cb1fd50fc49cae567e741a0e6334babcc1d23e7302221b18adcce34c
>+SIZE (gcc-6-20170802.tar.xz) = 72581920
> SHA256 (ada-bootstrap.i386.freebsd.100B.tar.bz2) = 7231209f2600275f554f788ad1d036cf633c4339ebd25bd479a5bb1ddcddedf3
> SIZE (ada-bootstrap.i386.freebsd.100B.tar.bz2) = 41229192
> SHA256 (ada-bootstrap.x86_64.dragonfly.41.tar.bz2) = eb7785d8b842aee2bb04b43adfb1346b178ee4e83d8775b4e6705fd23f1586f0

Actions: View | Diff

Attachments on bug 221883: 185846 | 186592 | 186653