svn commit: r373004 - in head: Mk Mk/Uses devel/gnustep-make lang/libobjc2

[Antoine Brodin]

Author: antoine
Date: Fri Nov 21 17:22:06 2014
New Revision: 373004
URL: https://svnweb.freebsd.org/changeset/ports/373004
QAT: https://qat.redports.org/buildarchive/r373004/

Log:
  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

Modified:
  head/Mk/Uses/compiler.mk
  head/Mk/Uses/objc.mk
  head/Mk/bsd.gnustep.mk
  head/devel/gnustep-make/Makefile
  head/lang/libobjc2/Makefile

Modified: head/Mk/Uses/compiler.mk
==============================================================================
--- head/Mk/Uses/compiler.mk	Fri Nov 21 16:42:51 2014	(r373003)
+++ head/Mk/Uses/compiler.mk	Fri Nov 21 17:22:06 2014	(r373004)
@@ -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++

Modified: head/Mk/Uses/objc.mk
==============================================================================
--- head/Mk/Uses/objc.mk	Fri Nov 21 16:42:51 2014	(r373003)
+++ head/Mk/Uses/objc.mk	Fri Nov 21 17:22:06 2014	(r373004)
@@ -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++

Modified: head/Mk/bsd.gnustep.mk
==============================================================================
--- head/Mk/bsd.gnustep.mk	Fri Nov 21 16:42:51 2014	(r373003)
+++ head/Mk/bsd.gnustep.mk	Fri Nov 21 17:22:06 2014	(r373004)
@@ -172,7 +172,7 @@ _CLANG!=	${DESTDIR}/usr/bin/clang --vers
 _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

Modified: head/devel/gnustep-make/Makefile
==============================================================================
--- head/devel/gnustep-make/Makefile	Fri Nov 21 16:42:51 2014	(r373003)
+++ head/devel/gnustep-make/Makefile	Fri Nov 21 17:22:06 2014	(r373004)
@@ -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

Modified: head/lang/libobjc2/Makefile
==============================================================================
--- head/lang/libobjc2/Makefile	Fri Nov 21 16:42:51 2014	(r373003)
+++ head/lang/libobjc2/Makefile	Fri Nov 21 17:22:06 2014	(r373004)
@@ -20,7 +20,7 @@ BROKEN_powerpc=		Does not compile on pow
 _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