From owner-svn-ports-all@freebsd.org Mon May 28 14:20:24 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0F34FEFA268; Mon, 28 May 2018 14:20:24 +0000 (UTC) (envelope-from ericbsd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B59B171648; Mon, 28 May 2018 14:20:23 +0000 (UTC) (envelope-from ericbsd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 79F3B67A7; Mon, 28 May 2018 14:20:23 +0000 (UTC) (envelope-from ericbsd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4SEKN3H028530; Mon, 28 May 2018 14:20:23 GMT (envelope-from ericbsd@FreeBSD.org) Received: (from ericbsd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4SEKNQX028529; Mon, 28 May 2018 14:20:23 GMT (envelope-from ericbsd@FreeBSD.org) Message-Id: <201805281420.w4SEKNQX028529@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ericbsd set sender to ericbsd@FreeBSD.org using -f From: Eric Turgeon Date: Mon, 28 May 2018 14:20:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r471043 - head/lang/gcc6-aux X-SVN-Group: ports-head X-SVN-Commit-Author: ericbsd X-SVN-Commit-Paths: head/lang/gcc6-aux X-SVN-Commit-Revision: 471043 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 May 2018 14:20:24 -0000 Author: ericbsd Date: Mon May 28 14:20:22 2018 New Revision: 471043 URL: https://svnweb.freebsd.org/changeset/ports/471043 Log: Update gcc6-aux to 6.5.0 and fix i386 Approved by: wg (mentor) Modified: head/lang/gcc6-aux/Makefile head/lang/gcc6-aux/Makefile.version Modified: head/lang/gcc6-aux/Makefile ============================================================================== --- head/lang/gcc6-aux/Makefile Mon May 28 13:23:10 2018 (r471042) +++ head/lang/gcc6-aux/Makefile Mon May 28 14:20:22 2018 (r471043) @@ -57,6 +57,8 @@ MODERN_BINUTILS= yes BOOTSTRAP_COMPILER= ada-bootstrap.aarch64.freebsd.120.tar.bz2 . elif ${ARCH} == amd64 && ${OSVERSION} > 1200030 #ino64 BOOTSTRAP_COMPILER= ada-bootstrap.${GARCH}.freebsd.120.tar.bz2 +. elif ${ARCH} == i386 && ${OSVERSION} > 1200030 #ino64 +BOOTSTRAP_COMPILER= ada-bootstrap.${GARCH}.freebsd.120.tar.bz2 . else BOOTSTRAP_COMPILER= ada-bootstrap.${GARCH}.freebsd.100B.tar.bz2 . endif @@ -116,10 +118,12 @@ DISTFILES+= ${BOOTSTRAP_COMPILER}:boot # for port maintenance, invoke "make makesum PLUS_BOOTSTRAPS=1" .if defined(PLUS_BOOTSTRAPS) DISTFILES= \ - ${IDENTIFICATION}.tar.bz2 \ + ${IDENTIFICATION}.tar.xz \ ada-bootstrap.i386.freebsd.100B.tar.bz2:boot \ + ada-bootstrap.i386.freebsd.120.tar.bz2:boot \ ada-bootstrap.x86_64.dragonfly.41.tar.bz2:boot \ ada-bootstrap.x86_64.freebsd.100B.tar.bz2:boot \ + ada-bootstrap.x86_64.freebsd.120.tar.bz2:boot \ ada-bootstrap.aarch64.freebsd.120.tar.bz2:boot .endif @@ -217,6 +221,8 @@ post-extract: ${WRKSRC}/gcc/config/i386/freebsd64.h \ ${WRKSRC}/gcc/config/i386/freebsd.h \ ${WRKSRC}/gcc/config/aarch64/aarch64-freebsd.h + @${REINPLACE_CMD} -e 's|static:crtbeginT.o%s;||' \ + ${WRKSRC}/gcc/config/freebsd-spec.h .if defined(MODERN_BINUTILS) # Use dwarf4-compatible addr2line (affects FreeBSD only) ${REINPLACE_CMD} -e 's|/usr/bin/addr2line|${PREFIX}/bin/addr2line|g' \ Modified: head/lang/gcc6-aux/Makefile.version ============================================================================== --- head/lang/gcc6-aux/Makefile.version Mon May 28 13:23:10 2018 (r471042) +++ head/lang/gcc6-aux/Makefile.version Mon May 28 14:20:22 2018 (r471043) @@ -1,15 +1,20 @@ # $FreeBSD$ +# The attempt to upgrade to version 6.4.1 was done incorrectly. +# When 6.5.1 is released, set the SNAPSHOT to the release date, +# but also set BUILD_RELEASE to "yes". Otherwise snapshots will +# continue to be used and eventually be removed from mirrors. + GCC_BRANCH= 6 -GCC_POINT= 4.1 +GCC_POINT= 5.0 GCC_VERSION= ${GCC_BRANCH}.${GCC_POINT} -SNAPSHOT= 20170802 +SNAPSHOT= 20180516 BUILD_RELEASE= no -MAIN_PR= 1 -UTIL_PR= 1 -ARMV7_PR= 2 -ARM64_PR= 3 -X86_PR= 2 +MAIN_PR= 0 +UTIL_PR= 0 +ARMV7_PR= 0 +ARM64_PR= 0 +X86_PR= 0 .if ${BUILD_RELEASE:Mno} # Snapshot naming pattern