From owner-svn-ports-all@FreeBSD.ORG Sat Oct 18 18:14:00 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 004D7CFF; Sat, 18 Oct 2014 18:13:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D5693B56; Sat, 18 Oct 2014 18:13:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9IIDxFv080728; Sat, 18 Oct 2014 18:13:59 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9IIDwQ6080720; Sat, 18 Oct 2014 18:13:58 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201410181813.s9IIDwQ6080720@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sat, 18 Oct 2014 18:13:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371153 - in head: Mk Mk/Uses lang/libobjc2 net/belle-sip X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Oct 2014 18:14:00 -0000 Author: antoine Date: Sat Oct 18 18:13:58 2014 New Revision: 371153 URL: https://svnweb.freebsd.org/changeset/ports/371153 QAT: https://qat.redports.org/buildarchive/r371153/ Log: Switch from clang33 to clang34 for ports using compiler:*11*, objc or gnustep on freebsd 8.4 and 9.1 PR: ports/193555 Differential Revision: https://reviews.freebsd.org/D935 Reviewed by: bapt Exp-run: self Modified: head/Mk/Uses/compiler.mk head/Mk/Uses/objc.mk head/Mk/bsd.gnustep.mk head/lang/libobjc2/Makefile head/net/belle-sip/Makefile Modified: head/Mk/Uses/compiler.mk ============================================================================== --- head/Mk/Uses/compiler.mk Sat Oct 18 18:06:39 2014 (r371152) +++ head/Mk/Uses/compiler.mk Sat Oct 18 18:13:58 2014 (r371153) @@ -150,10 +150,10 @@ CC= clang CXX= clang++ CHOSEN_COMPILER_TYPE= clang .else -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang33:${PORTSDIR}/lang/clang33 -CPP= ${LOCALBASE}/bin/clang-cpp33 -CC= ${LOCALBASE}/bin/clang33 -CXX= ${LOCALBASE}/bin/clang++33 +BUILD_DEPENDS+= ${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34 +CPP= ${LOCALBASE}/bin/clang-cpp34 +CC= ${LOCALBASE}/bin/clang34 +CXX= ${LOCALBASE}/bin/clang++34 CHOSEN_COMPILER_TYPE= clang .if ${OSVERSION} < 900033 USE_BINUTILS= yes @@ -176,11 +176,11 @@ CC= clang CXX= clang++ CHOSEN_COMPILER_TYPE= clang .else -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang33:${PORTSDIR}/lang/clang33 +BUILD_DEPENDS+= ${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34 CHOSEN_COMPILER_TYPE= clang -CPP= ${LOCALBASE}/bin/clang-cpp33 -CC= ${LOCALBASE}/bin/clang33 -CXX= ${LOCALBASE}/bin/clang++33 +CPP= ${LOCALBASE}/bin/clang-cpp34 +CC= ${LOCALBASE}/bin/clang34 +CXX= ${LOCALBASE}/bin/clang++34 .if ${OSVERSION} < 900033 USE_BINUTILS= yes LDFLAGS+= -B${LOCALBASE}/bin @@ -202,11 +202,11 @@ CC= clang CXX= clang++ CHOSEN_COMPILER_TYPE= clang .else -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang33:${PORTSDIR}/lang/clang33 +BUILD_DEPENDS+= ${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34 CHOSEN_COMPILER_TYPE= clang -CPP= ${LOCALBASE}/bin/clang-cpp33 -CC= ${LOCALBASE}/bin/clang33 -CXX= ${LOCALBASE}/bin/clang++33 +CPP= ${LOCALBASE}/bin/clang-cpp34 +CC= ${LOCALBASE}/bin/clang34 +CXX= ${LOCALBASE}/bin/clang++34 .if ${OSVERSION} < 900033 USE_BINUTILS= yes LDFLAGS+= -B${LOCALBASE}/bin Modified: head/Mk/Uses/objc.mk ============================================================================== --- head/Mk/Uses/objc.mk Sat Oct 18 18:06:39 2014 (r371152) +++ head/Mk/Uses/objc.mk Sat Oct 18 18:13:58 2014 (r371153) @@ -45,10 +45,10 @@ CC= /usr/bin/clang CPP= /usr/bin/clang-cpp CXX= /usr/bin/clang++ .else -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang33:${PORTSDIR}/lang/clang33 -CPP= ${LOCALBASE}/bin/clang-cpp33 -CC= ${LOCALBASE}/bin/clang33 -CXX= ${LOCALBASE}/bin/clang++33 +BUILD_DEPENDS+= ${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34 +CPP= ${LOCALBASE}/bin/clang-cpp34 +CC= ${LOCALBASE}/bin/clang34 +CXX= ${LOCALBASE}/bin/clang++34 .if ${OSVERSION} < 900033 USE_BINUTILS= yes LDFLAGS+= -B${LOCALBASE}/bin Modified: head/Mk/bsd.gnustep.mk ============================================================================== --- head/Mk/bsd.gnustep.mk Sat Oct 18 18:06:39 2014 (r371152) +++ head/Mk/bsd.gnustep.mk Sat Oct 18 18:13:58 2014 (r371153) @@ -173,10 +173,10 @@ _CLANG= 0 .endif .if ${_CLANG} < 33 -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang33:${PORTSDIR}/lang/clang33 -CPP= ${LOCALBASE}/bin/clang-cpp33 -CC= ${LOCALBASE}/bin/clang33 -CXX= ${LOCALBASE}/bin/clang++33 +BUILD_DEPENDS+= ${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34 +CPP= ${LOCALBASE}/bin/clang-cpp34 +CC= ${LOCALBASE}/bin/clang34 +CXX= ${LOCALBASE}/bin/clang++34 .else CPP= /usr/bin/clang-cpp CC= /usr/bin/clang Modified: head/lang/libobjc2/Makefile ============================================================================== --- head/lang/libobjc2/Makefile Sat Oct 18 18:06:39 2014 (r371152) +++ head/lang/libobjc2/Makefile Sat Oct 18 18:13:58 2014 (r371153) @@ -21,9 +21,9 @@ _CLANG!= if [ -f /usr/bin/clang ] ; then ${SED} -e 's/.*clang version \([0-9]\)\.\([0-9]\).*/\1\2/' ; else ${ECHO} 0 ; fi .if ${_CLANG} < 33 -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang33:${PORTSDIR}/lang/clang33 -CC= ${LOCALBASE}/bin/clang33 -CXX= ${LOCALBASE}/bin/clang++33 +BUILD_DEPENDS+= ${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34 +CC= ${LOCALBASE}/bin/clang34 +CXX= ${LOCALBASE}/bin/clang++34 .else CC= /usr/bin/clang CXX= /usr/bin/clang++ Modified: head/net/belle-sip/Makefile ============================================================================== --- head/net/belle-sip/Makefile Sat Oct 18 18:06:39 2014 (r371152) +++ head/net/belle-sip/Makefile Sat Oct 18 18:13:58 2014 (r371153) @@ -38,10 +38,15 @@ POLARSSL_LIB_DEPENDS= libpolarssl.so:${ post-extract: @${CP} ${DISTDIR}/antlr-3.4-complete.jar ${WRKDIR}/antlr-complete.jar +.include + post-patch: @${REINPLACE_CMD} -e 's|%%WRKDIR%%|${WRKDIR}|' -e 's|-lrt||' \ ${WRKSRC}/configure +.if ${CHOSEN_COMPILER_TYPE} == clang && (${OSVERSION} < 902512 || (${OSVERSION} >= 1000000 && ${OSVERSION} < 1000707)) + @${REINPLACE_CMD} 's, -fms-extensions,,' ${WRKSRC}/configure +.endif @${REINPLACE_CMD} -e 's|-timezone||' \ ${WRKSRC}/src/belle_sip_headers_impl.c -.include +.include