cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tighten BUILD_DEPENDS, so gcc3 won't be accepted where gcc4 is required and

Browse Source 
vice versa
This commit is contained in:
naddy 2011-03-26 19:13:28 +00:00
parent bc2973379a
commit 0c47e7e2bf
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lang/gcc/3.3/gcc3.port.mk
View File

@ -1,4 +1,4 @@
# $OpenBSD: gcc3.port.mk,v 1.6 2011/01/15 01:07:45 naddy Exp $
# $OpenBSD: gcc3.port.mk,v 1.7 2011/03/26 19:13:28 naddy Exp $
MODGCC3_ARCHES?=
# Supported languages for now
@ -11,21 +11,21 @@ MODGCC3_LANGS+= ${_MODGCC3CC}
.if ${MODGCC3_ARCHES:L} != ""
. for _i in ${MODGCC3_ARCHES}
. if !empty(MACHINE_ARCH:M${_i})
BUILD_DEPENDS+= lang/gcc/3.3
BUILD_DEPENDS+= gcc->=3.3,<3.4|gcc->=3.3v0,<3.4v0:lang/gcc/3.3
. for _j in ${MODGCC3_LANGS:L}
. if !empty(_MODGCC3CC:L:M${_j})
MODGCC3_post-patch+= ln -s ${LOCALBASE}/bin/eg${_MODGCC3CC} ${WRKDIR}/bin/g${_MODGCC3CC};
MODGCC3_post-patch+= ln -s ${LOCALBASE}/bin/eg${_MODGCC3CC} ${WRKDIR}/bin/${_MODGCC3CC};
. endif
. if !empty(_MODGCC3CXX:L:M${_j})
BUILD_DEPENDS+= lang/gcc/3.3,-c++
BUILD_DEPENDS+= g++->=3.3,<3.4|g++->=3.3v0,<3.4v0:lang/gcc/3.3,-c++
LIB_DEPENDS+= libstdc++->=3.3,<3.4|libstdc++->=3.3v0,<3.4v0:lang/gcc/3.3,-estdc
WANTLIB += estdc++=6
MODGCC3_post-patch+= ln -s ${LOCALBASE}/bin/e${_MODGCC3CXX} ${WRKDIR}/bin/g++;
MODGCC3_post-patch+= ln -s ${LOCALBASE}/bin/e${_MODGCC3CXX} ${WRKDIR}/bin/${_MODGCC3CXX};
. endif
. if !empty(_MODGCC3G77:L:M${_j})
BUILD_DEPENDS+= lang/gcc/3.3,-g77
BUILD_DEPENDS+= g77->=3.3,<3.4|g77->=3.3v0,<3.4v0:lang/gcc/3.3,-g77
MODGCC3_post-patch+= ln -s ${LOCALBASE}/bin/e${_MODGCC3G77} ${WRKDIR}/bin/f77;
MODGCC3_post-patch+= ln -s ${LOCALBASE}/bin/e${_MODGCC3G77} ${WRKDIR}/bin/${_MODGCC3G77};
. endif

10
lang/gcc/4.2/gcc4.port.mk
View File

@ -1,4 +1,4 @@
# $OpenBSD: gcc4.port.mk,v 1.11 2010/11/17 08:05:17 espie Exp $
# $OpenBSD: gcc4.port.mk,v 1.12 2011/03/26 19:13:28 naddy Exp $
MODGCC4_ARCHES?=
MODGCC4_LANGS?=
@ -33,7 +33,7 @@ _MODGCC4_LINKS =
.if ${_MODGCC4_ARCH_USES:L} == "yes"
. if ${MODGCC4_LANGS:L:Mc} && ${COMPILER_VERSION:L:Ngcc4*}
BUILD_DEPENDS += lang/gcc/4.2
BUILD_DEPENDS += gcc->=4.2,<4.3|gcc->=4.2v0,<4.3v0:lang/gcc/4.2
_MODGCC4_LINKS += egcc gcc egcc cc
. endif
@ -42,7 +42,7 @@ _MODGCC4_LINKS += egcc gcc egcc cc
MODGCC4STDCPP = stdc++
WANTLIB += stdc++>=50.0
. else
BUILD_DEPENDS += lang/gcc/4.2,-c++
BUILD_DEPENDS += g++->=4.2,<4.3|g++->=4.2v0,<4.3v0:lang/gcc/4.2,-c++
MODGCC4STDCPP = estdc++
LIB_DEPENDS += libstdc++->=4.2,<4.3|libstdc++->=4.2v0,<4.3v0:lang/gcc/4.2,-estdc
WANTLIB += estdc++>=7
@ -51,14 +51,14 @@ _MODGCC4_LINKS += eg++ g++ eg++ c++
. endif
. if ${MODGCC4_LANGS:L:Mfortran}
BUILD_DEPENDS += lang/gcc/4.2,-f95
BUILD_DEPENDS += g95->=4.2,<4.3|g95->=4.2v0,<4.3v0:lang/gcc/4.2,-f95
WANTLIB += gfortran>=2
LIB_DEPENDS += g95->=4.2,<4.3|g95->=4.2v0,<4.3v0:lang/gcc/4.2,-f95
_MODGCC4_LINKS += egfortran gfortran
. endif
. if ${MODGCC4_LANGS:L:Mjava}
BUILD_DEPENDS += lang/gcc/4.2,-java,java
BUILD_DEPENDS += gcj->=4.2,<4.3|gcj->=4.2v0,<4.3v0:lang/gcc/4.2,-java,java
_MODGCC4_LINKS += egcj gcj egcjh gcjh ejar gjar egij gij
. endif