* export variables pertaining to WANTLIB and LIB_DEPENDS even when not
using the gcc4 compiler (can be committed independently of the update)
* use these variables in clang.port.mk
Index: gcc/4.9/gcc4.port.mk
===================================================================
RCS file: /cvs/ports/lang/gcc/4.9/gcc4.port.mk,v
retrieving revision 1.4
diff -u -p -r1.4 gcc4.port.mk
--- gcc/4.9/gcc4.port.mk 17 Jul 2015 22:42:12 -0000 1.4
+++ gcc/4.9/gcc4.port.mk 11 Nov 2015 10:24:23 -0000
@@ -29,6 +29,10 @@ _MODGCC4_ARCH_USES = Yes
COMPILER_VERSION ?= gcc2
+MODGCC4STDCPP = estdc++
+MODGCC4_CPPLIBDEP = lang/gcc/4.9,-libs>=4.9,<4.10
+MODGCC4_CPPWANTLIB = estdc++>=17
+
_MODGCC4_LINKS =
.if ${_MODGCC4_ARCH_USES:L} == "yes"
@@ -39,10 +43,7 @@ _MODGCC4_LINKS += egcc gcc egcc cc
. if ${MODGCC4_LANGS:L:Mc++}
BUILD_DEPENDS += lang/gcc/4.9,-c++>=4.9,<4.10
-MODGCC4STDCPP = estdc++
-MODGCC4_CPPLIBDEP = lang/gcc/4.9,-libs>=4.9,<4.10
LIB_DEPENDS += ${MODGCC4_CPPLIBDEP}
-MODGCC4_CPPWANTLIB = estdc++>=17
WANTLIB += ${MODGCC4_CPPWANTLIB}
_MODGCC4_LINKS += eg++ g++ eg++ c++
. endif
Index: clang/clang.port.mk
===================================================================
RCS file: /cvs/ports/lang/clang/clang.port.mk,v
retrieving revision 1.15
diff -u -p -r1.15 clang.port.mk
--- clang/clang.port.mk 11 Feb 2015 00:30:00 -0000 1.15
+++ clang/clang.port.mk 11 Nov 2015 10:25:47 -0000
@@ -1,6 +1,6 @@
# $OpenBSD: clang.port.mk,v 1.15 2015/02/11 00:30:00 brad Exp $
-MODCLANG_VERSION= 3.5.20140228p27
+MODCLANG_VERSION= 3.7.0
MODCLANG_ARCHS ?=
MODCLANG_LANGS ?=
@@ -35,6 +35,12 @@ _MODCLANG_LINKS = clang gcc clang cc
. if ${MODCLANG_LANGS:L:Mc++}
_MODCLANG_LINKS += clang++ g++ clang++ c++
+# uses libestdc++
+MODULES += gcc4
+MODCLANG_CPPLIBDEP = ${MODGCC4_CPPLIBDEP}
+LIB_DEPENDS += ${MODCLANG_CPPLIBDEP}
+MODCLANG_CPPWANTLIB = ${MODGCC4_CPPWANTLIB}
+WANTLIB += ${MODCLANG_CPPWANTLIB}
. endif
.endif
