aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrooks Davis <brooks@FreeBSD.org>2014-06-17 19:52:54 +0000
committerBrooks Davis <brooks@FreeBSD.org>2014-06-17 19:52:54 +0000
commit2573dc6c614de94471f073c030d214bd862f0d38 (patch)
tree5de9a63cbac1ea99caa73dec15e0caa52cad8bc1
parent131ee8a14ba98830508de1fc0f602eb84eb7bcf1 (diff)
downloadports-2573dc6c614de94471f073c030d214bd862f0d38.tar.gz
ports-2573dc6c614de94471f073c030d214bd862f0d38.zip
MFC r358146:
Install missing components of llvm-lit. PR: 190562 Approved by: portmgr (erwin)
Notes
Notes: svn path=/branches/2014Q2/; revision=358172
-rw-r--r--devel/llvm34/Makefile9
-rw-r--r--devel/llvm34/pkg-plist9
2 files changed, 15 insertions, 3 deletions
diff --git a/devel/llvm34/Makefile b/devel/llvm34/Makefile
index 6e8627b90933..6eb67394db20 100644
--- a/devel/llvm34/Makefile
+++ b/devel/llvm34/Makefile
@@ -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}
diff --git a/devel/llvm34/pkg-plist b/devel/llvm34/pkg-plist
index 0b08dc47c4fc..c12649873d1e 100644
--- a/devel/llvm34/pkg-plist
+++ b/devel/llvm34/pkg-plist
@@ -628,8 +628,8 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/ValueMapper.h
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%%