From owner-svn-ports-all@FreeBSD.ORG Tue Jun 17 19:52:55 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9ABF8286; Tue, 17 Jun 2014 19:52:55 +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 8790326A7; Tue, 17 Jun 2014 19:52:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5HJqtAp066230; Tue, 17 Jun 2014 19:52:55 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5HJqtYi066226; Tue, 17 Jun 2014 19:52:55 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201406171952.s5HJqtYi066226@svn.freebsd.org> From: Brooks Davis Date: Tue, 17 Jun 2014 19:52:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r358172 - branches/2014Q2/devel/llvm34 X-SVN-Group: ports-branches 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 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: Tue, 17 Jun 2014 19:52:55 -0000 Author: brooks Date: Tue Jun 17 19:52:54 2014 New Revision: 358172 URL: http://svnweb.freebsd.org/changeset/ports/358172 QAT: https://qat.redports.org/buildarchive/r358172/ Log: MFC r358146: Install missing components of llvm-lit. PR: 190562 Approved by: portmgr (erwin) Modified: branches/2014Q2/devel/llvm34/Makefile branches/2014Q2/devel/llvm34/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/devel/llvm34/Makefile ============================================================================== --- branches/2014Q2/devel/llvm34/Makefile Tue Jun 17 19:44:28 2014 (r358171) +++ branches/2014Q2/devel/llvm34/Makefile Tue Jun 17 19:52:54 2014 (r358172) @@ -2,6 +2,7 @@ PORTNAME= llvm PORTVERSION= 3.4 +PORTREVISION= 1 CATEGORIES= devel lang MASTER_SITES= http://llvm.org/releases/${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}.src @@ -153,7 +154,8 @@ post-patch: ${REINPLACE_CMD} -e 's|import lit|import lit${LLVM_SUFFIX}|' \ -e 's|from lit|from lit${LLVM_SUFFIX}|' \ -e 's|lit\.|lit${LLVM_SUFFIX}.|' \ - ${WRKSRC}/utils/lit/lit.py ${WRKSRC}/utils/lit/lit/*.py + ${WRKSRC}/utils/lit/lit.py ${WRKSRC}/utils/lit/lit/*.py \ + ${WRKSRC}/utils/lit/lit/formats/*.py .if ${PORT_OPTIONS:MCMAKE} post-configure: @@ -207,6 +209,9 @@ post-install: ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} ${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/*.py \ ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} + ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX}/formats + ${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/formats/*.py \ + ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX}/formats ${INSTALL_PROGRAM} ${WRKSRC}/${RELEASE_TYPE}/bin/FileCheck \ ${STAGEDIR}${LLVM_PREFIX}/bin/ ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \ @@ -257,6 +262,8 @@ build-plist: -e 's|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|' >> ${PLIST} echo "%%LIT%%@dirrm %%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%" >> \ ${PLIST} + echo "%%LIT%%@dirrm %%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/formats" >> \ + ${PLIST} ${FIND} ${STAGEDIR}${DOCSDIR} -type d | \ ${SED} -e 's|${STAGEDIR}${DOCSDIR}|%%PORTDOCS%%@dirrm %%DOCSDIR%%|' | \ ${SORT} -r >> ${PLIST} Modified: branches/2014Q2/devel/llvm34/pkg-plist ============================================================================== --- branches/2014Q2/devel/llvm34/pkg-plist Tue Jun 17 19:44:28 2014 (r358171) +++ branches/2014Q2/devel/llvm34/pkg-plist Tue Jun 17 19:52:54 2014 (r358172) @@ -628,8 +628,8 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transfo llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Vectorize.h llvm%%LLVM_SUFFIX%%/lib/BugpointPasses.so llvm%%LLVM_SUFFIX%%/lib/LLVMHello.so -llvm%%LLVM_SUFFIX%%/lib/libLLVM-3.4.so -llvm%%LLVM_SUFFIX%%/lib/libLLVM-3.4.so.0 +llvm%%LLVM_SUFFIX%%/lib/libLLVM-%%PORTVERSION%%.so +llvm%%LLVM_SUFFIX%%/lib/libLLVM-%%PORTVERSION%%.so.0 llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64AsmParser.a llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64AsmPrinter.a llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64CodeGen.a @@ -738,6 +738,10 @@ llvm%%LLVM_SUFFIX%%/lib/libLTO.so %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/TestingConfig.py %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/__init__.py %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/discovery.py +%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/formats/__init__.py +%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/formats/base.py +%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/formats/googletest.py +%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/formats/shtest.py %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/main.py %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/run.py %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/util.py @@ -1003,5 +1007,6 @@ llvm%%LLVM_SUFFIX%%/lib/libLTO.so @dirrm llvm%%LLVM_SUFFIX%%/bin @dirrm llvm%%LLVM_SUFFIX%% %%LIT%%@dirrm %%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%% +%%LIT%%@dirrm %%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/formats %%PORTDOCS%%@dirrm %%DOCSDIR%%/html %%PORTDOCS%%@dirrm %%DOCSDIR%%