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

sync changes from gcc/4.9; from Brad, ok pascal@

Browse Source
This commit is contained in:
sthen 2018-11-05 11:52:55 +00:00
parent c3f5af08a4
commit a4053da061
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lang/gcc/6/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.11 2018/11/01 22:09:30 sthen Exp $
# $OpenBSD: Makefile,v 1.12 2018/11/05 11:52:55 sthen Exp $
ONLY_FOR_ARCHS = amd64 arm hppa i386 mips64 mips64el powerpc sparc64
ONLY_FOR_ARCHS = alpha amd64 arm hppa i386 mips64 mips64el powerpc sparc64
DPB_PROPERTIES = parallel
V = 6.4.0
REVISION = 1
REVISION = 2
FULL_VERSION = $V
FULL_PKGVERSION = $V
@ -216,7 +216,7 @@ WANTLIB-main = ${WANTLIB}
WANTLIB-ada = ${WANTLIB} pthread util
WANTLIB-libs = m pthread
LIB_DEPENDS += devel/gmp>=4.2 \
LIB_DEPENDS += devel/gmp,no_cxx,bootstrap \
devel/mpfr \
devel/libmpc
LIB_DEPENDS-libs =

20
lang/gcc/6/gcc4.port.mk
View File

@ -1,6 +1,6 @@
# $OpenBSD: gcc4.port.mk,v 1.3 2017/11/05 09:14:28 espie Exp $
# $OpenBSD: gcc4.port.mk,v 1.4 2018/11/05 11:52:55 sthen Exp $
MODGCC4_ARCHS ?=
MODGCC4_ARCHS ?= ${GCC49_ARCHS}
MODGCC4_LANGS ?=
@ -19,20 +19,20 @@ ERRORS += "Fatal: unknown language ${_l}"
_MODGCC4_ARCH_USES = No
.if ${MODGCC4_ARCHS:L} != ""
. for _i in ${MODGCC4_ARCHS}
. if !empty(MACHINE_ARCH:M${_i})
.for _i in ${MODGCC4_ARCHS}
. if !empty(MACHINE_ARCH:M${_i})
_MODGCC4_ARCH_USES = Yes
. endif
. endfor
.endif
. endif
.endfor
COMPILER_VERSION ?= gcc2
_MODGCC4_LINKS =
MODGCC4STDCPP = estdc++
MODGCC4_CPPLIBDEP = lang/gcc/6,-libs>=6,<7
MODGCC4_CPPDEP = lang/gcc/6,-c++>=6,<7
MODGCC4_CPPWANTLIB = estdc++>=18
MODGCC4_ATOMICWANTLIB = atomic
.if ${_MODGCC4_ARCH_USES:L} == "yes"
@ -40,12 +40,12 @@ MODGCC4_CPPWANTLIB = estdc++>=18
BUILD_DEPENDS += lang/gcc/6>=6,<7
# XXX ports-clang already defines this
. if !${COMPILER_LINKS:Mgcc}
COMPILER_LINKS += cc ${LOCALBASE}/bin/egcc gcc ${LOCALBASE}/bin/egcc
COMPILER_LINKS += gcc ${LOCALBASE}/bin/egcc cc ${LOCALBASE}/bin/egcc
. endif
. endif
. if ${MODGCC4_LANGS:L:Mc++}
BUILD_DEPENDS += lang/gcc/6,-c++>=6,<7
BUILD_DEPENDS += ${MODGCC4_CPPDEP}
LIB_DEPENDS += ${MODGCC4_CPPLIBDEP}
WANTLIB += ${MODGCC4_CPPWANTLIB}
# XXX ports-clang already defines this