svn commit: r358172 - branches/2014Q2/devel/llvm34

[Brooks Davis]

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%%