sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove CONFLICT with lang/gcc (which now pulls in lang/gcc5 by default).

Browse source 
Instead add mutual CONFLICTS between lang/gcc5 and lang/gcc5-devel which
we actually missed.
This commit is contained in:
Gerald Pfeifer 2017-05-28 09:31:40 +00:00
parent 0d0becb5db
commit df84a690e2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=441905
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lang/gcc5-devel/Makefile
View file

@ -24,7 +24,7 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils
BUILD_DEPENDS+= runtest:misc/dejagnu BUILD_DEPENDS+= runtest:misc/dejagnu
.endif .endif
CONFLICTS= gcc-5.* CONFLICTS= gcc5-5.*
CPE_VENDOR= gnu CPE_VENDOR= gnu
CPE_VERSION= ${GCC_VERSION} CPE_VERSION= ${GCC_VERSION}

2
lang/gcc5/Makefile
View file

@ -24,7 +24,7 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils
BUILD_DEPENDS+= runtest:misc/dejagnu BUILD_DEPENDS+= runtest:misc/dejagnu
.endif .endif
CONFLICTS= gcc-5.* CONFLICTS= gcc5-devel-5.*
CPE_VENDOR= gnu CPE_VENDOR= gnu
GCC_VERSION= ${PORTVERSION} GCC_VERSION= ${PORTVERSION}