Date: Mon, 28 May 2018 20:06:22 +0200 From: Tobias Kortkamp <tobik@FreeBSD.org> To: Eric Turgeon <ericbsd@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r471043 - head/lang/gcc6-aux Message-ID: <1527530782.108895.1388220600.72B829AD@webmail.messagingengine.com> In-Reply-To: <201805281420.w4SEKNQX028529@repo.freebsd.org> References: <201805281420.w4SEKNQX028529@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, May 28, 2018, at 16:20, Eric Turgeon wrote: > 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 > Hi, this is missing an update to distinfo. => gcc-6-20180516.tar.xz is not in /usr/ports/lang/gcc6-aux/distinfo. => Either /usr/ports/lang/gcc6-aux/distinfo is out of date, or => gcc-6-20180516.tar.xz is spelled incorrectly. *** Error code 1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1527530782.108895.1388220600.72B829AD>