Date: Tue, 24 Mar 2015 00:40:56 +0800 From: Sunpoet Po-Chuan Hsieh <sunpoet@freebsd.org> To: Gerald Pfeifer <gerald@freebsd.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r381968 - head/lang/gcc5 Message-ID: <CAMHz58SEVfiUsrz0f2dMVsvA-kL4e%2BTF2JcuzYBp7bPPEYsCow@mail.gmail.com> In-Reply-To: <201503222311.t2MNBE8d075929@svn.freebsd.org> References: <201503222311.t2MNBE8d075929@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Mar 23, 2015 at 7:11 AM, Gerald Pfeifer <gerald@freebsd.org> wrote: > Author: gerald > Date: Sun Mar 22 23:11:13 2015 > New Revision: 381968 > URL: https://svnweb.freebsd.org/changeset/ports/381968 > QAT: https://qat.redports.org/buildarchive/r381968/ > > Log: > Add CPE information. [1] > > Use PKGNAMESUFFIX so that PORTNAME falls back to plain gcc and we > can avoid setting DISTNAME and CPE_PRODUCT. [2] > > PR: 198260 [1] > Submitted by: shun.fbsd.pr@dropcut.net [1] > Suggested by: mat [2] > > Modified: > head/lang/gcc5/Makefile > > Modified: head/lang/gcc5/Makefile > > ============================================================================== > --- head/lang/gcc5/Makefile Sun Mar 22 22:35:24 2015 (r381967) > +++ head/lang/gcc5/Makefile Sun Mar 22 23:11:13 2015 (r381968) > @@ -1,12 +1,12 @@ > # Created by: Gerald Pfeifer <gerald@FreeBSD.org> > # $FreeBSD$ > > -PORTNAME= gcc5 > +PORTNAME= gcc > PORTVERSION= 5.0.s20150315 > CATEGORIES= lang java > MASTER_SITES= ${MASTER_SITE_GCC} > MASTER_SITE_SUBDIR= snapshots/${DISTVERSION} > -DISTNAME= gcc-${DISTVERSION} > +PKGNAMESUFFIX= ${SUFFIX} > > MAINTAINER= gerald@FreeBSD.org > COMMENT= GNU Compiler Collection 5 > @@ -24,6 +24,9 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/as:${PORT > BUILD_DEPENDS+= runtest:${PORTSDIR}/misc/dejagnu > .endif > > +CPE_VENDOR= gnu > +CPE_VERSION= ${GCC_VERSION} > + > # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names > # of executables and directories once installed. A PORTVERSION of > # Y.2.s20140817 results in values of Y-20140817, Y.2.0, and Y > @@ -32,7 +35,7 @@ DISTVERSION= ${PORTVERSION:C/([0-9]+).*\ > GCC_VERSION= ${PORTVERSION:C/(.+)\.s[0-9]{8}/\1.0/} > SUFFIX= ${PORTVERSION:C/([0-9]+).*/\1/} > ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 sparc64 arm armv6 > armv6hf > -USES= gmake iconv libtool makeinfo perl5 tar:bzip2 > +USES= cpe gmake iconv libtool makeinfo perl5 tar:bzip2 > USE_BINUTILS= yes > USE_PERL5= build > SSP_UNSAFE= yes > > Hi Gerald, USE_LDCONFIG stores the directory name to ${LOCALBASE}/libdata/ldconfig/${UNIQUENAME}. Since lang/gcc* now share same PORTNAME (gcc), you need to set UNIQUENAME manually. Otherwise the following error would occurs. ===> Checking if gcc5 already installed ===> Registering installation for gcc5-5.0.s20150322 Installing gcc5-5.0.s20150322... pkg-static: gcc5-5.0.s20150322 conflicts with gcc-4.8.4 (installs files into the same place). Problematic file: /usr/local/libdata/ldconfig/gcc *** Error code 70 Stop. make: stopped in /usr/ports/lang/gcc5 <http://people.FreeBSD.org/~sunpoet/pgpkeys.txt>; Regards, sunpoet
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMHz58SEVfiUsrz0f2dMVsvA-kL4e%2BTF2JcuzYBp7bPPEYsCow>