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

tweak WANTLIB again; build problem reported by ajacoutot.

Browse Source 
quadmath is used by -f95 (WANTLIB), however the lib is also present in GCC 4.9
which is required all over the place for bulk builds. So bodge around it by
removing the WANTLIB and at least specifying a RUN_DEPENDS-f95 instead.

This is pretty much academic anyway as you can't install gcc-4.8 on a typical
workstation as it will conflict with gcc-4.9 libs that are a common dependency.
This commit is contained in:
sthen 2015-08-18 10:14:06 +00:00
parent 9426338036
commit 5f0d137420
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lang/gcc/4.8/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.49 2015/08/17 19:52:39 sthen Exp $
# $OpenBSD: Makefile,v 1.50 2015/08/18 10:14:06 sthen Exp $
BROKEN-mips64 = ld: not enough GOT space for local GOT entries
BROKEN-mips64el = ld: not enough GOT space for local GOT entries
@ -38,7 +38,7 @@ PKGSPEC-main = gcc->=4.8,<4.9
REVISION-main = 4
REVISION-c++ = 2
REVISION-estdc =2
REVISION-f95 = 3
REVISION-f95 = 4
REVISION-java = 3
REVISION-objc = 2
REVISION-ada = 3
@ -208,6 +208,10 @@ PKG_ARGS += -DITM=0
# depends on __float128
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
PKG_ARGS += -DQUADMATH=1
# XXX quadmath is actually a WANTLIB of -f95, but it's just listed as
# a RUN_DEPENDS rather than LIB_DEPENDS+WANTLIB due to the mess of
# multiple GCC versions.
RUN_DEPENDS-f95 = ${BUILD_PKGPATH},-main>=4.8,<4.9
.else
PKG_ARGS +=-DQUADMATH=0
.endif
@ -223,7 +227,6 @@ RUN_DEPENDS-c++ = ${RUN_DEPENDS} \
WANTLIB-estdc = m
WANTLIB-java = ${WANTLIB} pthread
WANTLIB-main = ${WANTLIB} pthread
WANTLIB-f95 = ${WANTLIB} quadmath
WANTLIB-ada = ${WANTLIB} pthread util
LIB_DEPENDS += devel/gmp>=4.2 \