From owner-svn-ports-all@FreeBSD.ORG Fri Feb 14 21:49:16 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 00AB1A4D; Fri, 14 Feb 2014 21:49:15 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C65601A49; Fri, 14 Feb 2014 21:49:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1ELnFQu050589; Fri, 14 Feb 2014 21:49:15 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1ELnFSB050587; Fri, 14 Feb 2014 21:49:15 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201402142149.s1ELnFSB050587@svn.freebsd.org> From: Brooks Davis Date: Fri, 14 Feb 2014 21:49:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344317 - in head: devel/llvm33 lang/clang33 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.17 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: Fri, 14 Feb 2014 21:49:16 -0000 Author: brooks Date: Fri Feb 14 21:49:15 2014 New Revision: 344317 URL: http://svnweb.freebsd.org/changeset/ports/344317 QAT: https://qat.redports.org/buildarchive/r344317/ Log: Fix build when python 3 is the default. PR: ports/186641, ports/186642 Submitted by: Gereon Kaiping Modified: head/devel/llvm33/Makefile head/lang/clang33/Makefile Modified: head/devel/llvm33/Makefile ============================================================================== --- head/devel/llvm33/Makefile Fri Feb 14 21:03:41 2014 (r344316) +++ head/devel/llvm33/Makefile Fri Feb 14 21:49:15 2014 (r344317) @@ -2,7 +2,7 @@ PORTNAME= llvm PORTVERSION= 3.3 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= devel lang MASTER_SITES= http://llvm.org/releases/${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}.src @@ -112,10 +112,10 @@ CONFIGURE_ARGS+= --disable-docs .if ${PORT_OPTIONS:MLIT} MAN1SRCS+= lit.1 -USE_PYTHON= yes +USE_PYTHON= -2.9 LIT_COMMANDS= lit llvm-lit FileCheck .else -USE_PYTHON_BUILD= yes +USE_PYTHON_BUILD= -2.9 .endif .if ${PORT_OPTIONS:MLTOPLUGIN} @@ -164,7 +164,7 @@ post-patch: .if ${PORT_OPTIONS:MCMAKE} post-configure: ${MKDIR} ${WRKDIR}/cmake - cd ${WRKDIR}/cmake && cmake -G "Unix Makefiles" ${WRKSRC} + cd ${WRKDIR}/cmake && cmake -DPYTHON_EXECUTABLE=${PYTHON_CMD} -G "Unix Makefiles" ${WRKSRC} ${REINPLACE_CMD} -e 's|${WRKDIR}/cmake|${LLVM_PREFIX}|' \ -e 's|${WRKSRC}/cmake/modules|${DATADIR}/cmake|' \ ${WRKDIR}/cmake/share/llvm/cmake/LLVMConfig.cmake Modified: head/lang/clang33/Makefile ============================================================================== --- head/lang/clang33/Makefile Fri Feb 14 21:03:41 2014 (r344316) +++ head/lang/clang33/Makefile Fri Feb 14 21:49:15 2014 (r344317) @@ -2,7 +2,7 @@ PORTNAME= clang DISTVERSION= 3.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= lang devel MASTER_SITES= http://llvm.org/releases/${PORTVERSION}/ PKGNAMESUFFIX= ${LLVM_SUFFIX} @@ -34,7 +34,7 @@ GNU_CONFIGURE= yes GNU_CONFIGURE_PREFIX= ${LLVM_PREFIX} USES= gmake perl5 USE_LDCONFIG= yes -USE_PYTHON_BUILD= yes +USE_PYTHON_BUILD= -2.9 MAKE_ARGS= CLANG_TBLGEN=${WRKSRC}/${RELTYPE}/bin/clang-tblgen \ LLVMIncDir=${LLVM_PREFIX}/include \