diff options
| author | antoine <antoine@FreeBSD.org> | 2014-11-21 17:22:06 +0000 |
|---|---|---|
| committer | antoine <antoine@FreeBSD.org> | 2014-11-21 17:22:06 +0000 |
| commit | e2ef40808724d7bbb30946850717105848df8388 (patch) | |
| tree | b5023c70f2c93e58e53df1a20fe36c17de37b8e5 | |
| parent | ed8b58616d3bf4b7cd6ce0fae787ad8205b059f8 (diff) | |
| download | FreeBSD-ports-e2ef40808724d7bbb30946850717105848df8388.zip FreeBSD-ports-e2ef40808724d7bbb30946850717105848df8388.tar.gz | |
Enforce clang 3.4 in USES=c*11*,objc,gnustep as clang 3.3 has some bugs
Requested by: bapt
PR: ports/195122
Differential Revision: https://reviews.freebsd.org/D1181
Exp-run by: self
With hat: portmgr
| -rw-r--r-- | Mk/Uses/compiler.mk | 12 | ||||
| -rw-r--r-- | Mk/Uses/objc.mk | 4 | ||||
| -rw-r--r-- | Mk/bsd.gnustep.mk | 2 | ||||
| -rw-r--r-- | devel/gnustep-make/Makefile | 2 | ||||
| -rw-r--r-- | lang/libobjc2/Makefile | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/Mk/Uses/compiler.mk b/Mk/Uses/compiler.mk index a5bb4cb..4f715ea 100644 --- a/Mk/Uses/compiler.mk +++ b/Mk/Uses/compiler.mk @@ -143,8 +143,8 @@ CHOSEN_COMPILER_TYPE= gcc .if (defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc) || (${ARCH} != amd64 && ${ARCH} != i386) # clang not always supported on Tier-2 USE_GCC= yes CHOSEN_COMPILER_TYPE= gcc -.elif (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 33) || ${COMPILER_TYPE} == gcc -.if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 33 +.elif (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 34) || ${COMPILER_TYPE} == gcc +.if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 34 CPP= clang-cpp CC= clang CXX= clang++ @@ -169,8 +169,8 @@ LDFLAGS+= -B${LOCALBASE}/bin .if (defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc) || (${ARCH} != amd64 && ${ARCH} != i386) # clang not always supported on Tier-2 USE_GCC= yes CHOSEN_COMPILER_TYPE= gcc -.elif (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 33) || ${COMPILER_TYPE} == gcc -.if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 33 +.elif (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 34) || ${COMPILER_TYPE} == gcc +.if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 34 CPP= clang-cpp CC= clang CXX= clang++ @@ -195,8 +195,8 @@ LDFLAGS+= -B${LOCALBASE}/bin .if (defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc) || (${ARCH} != amd64 && ${ARCH} != i386) # clang not always supported on Tier-2 USE_GCC= yes CHOSEN_COMPILER_TYPE= gcc -.elif (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 33) || ${COMPILER_TYPE} == gcc -.if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 33 +.elif (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 34) || ${COMPILER_TYPE} == gcc +.if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 34 CPP= clang-cpp CC= clang CXX= clang++ diff --git a/Mk/Uses/objc.mk b/Mk/Uses/objc.mk index e22f007..41ec891 100644 --- a/Mk/Uses/objc.mk +++ b/Mk/Uses/objc.mk @@ -39,8 +39,8 @@ ALT_COMPILER_TYPE= gcc .endif # We do always need clang -.if (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 33) || ${COMPILER_TYPE} != clang -.if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 33 +.if (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 34) || ${COMPILER_TYPE} != clang +.if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= 34 CC= /usr/bin/clang CPP= /usr/bin/clang-cpp CXX= /usr/bin/clang++ diff --git a/Mk/bsd.gnustep.mk b/Mk/bsd.gnustep.mk index ca69657..f169184 100644 --- a/Mk/bsd.gnustep.mk +++ b/Mk/bsd.gnustep.mk @@ -172,7 +172,7 @@ _CLANG!= ${DESTDIR}/usr/bin/clang --version | head -1 | \ _CLANG= 0 .endif -.if ${_CLANG} < 33 +.if ${_CLANG} < 34 BUILD_DEPENDS+= ${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34 CPP= ${LOCALBASE}/bin/clang-cpp34 CC= ${LOCALBASE}/bin/clang34 diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile index 4b9db6f..ad4d67c 100644 --- a/devel/gnustep-make/Makefile +++ b/devel/gnustep-make/Makefile @@ -3,7 +3,7 @@ PORTNAME= gnustep-make PORTVERSION= 2.6.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel gnustep MASTER_SITES= ${MASTER_SITE_GNUSTEP} MASTER_SITE_SUBDIR= core diff --git a/lang/libobjc2/Makefile b/lang/libobjc2/Makefile index 92a230e..d135f51 100644 --- a/lang/libobjc2/Makefile +++ b/lang/libobjc2/Makefile @@ -20,7 +20,7 @@ BROKEN_powerpc= Does not compile on powerpc: Unsupported relocation type 10 _CLANG!= if [ -f /usr/bin/clang ] ; then /usr/bin/clang --version | head -1 | \ ${SED} -e 's/.*clang version \([0-9]\)\.\([0-9]\).*/\1\2/' ; else ${ECHO} 0 ; fi -.if ${_CLANG} < 33 +.if ${_CLANG} < 34 BUILD_DEPENDS+= ${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34 CC= ${LOCALBASE}/bin/clang34 CXX= ${LOCALBASE}/bin/clang++34 |
