svn commit: r369351 - in head/lang/clang34: . files
Brooks Davis
brooks at FreeBSD.org
Sat Sep 27 01:00:43 UTC 2014
Author: brooks
Date: Sat Sep 27 01:00:41 2014
New Revision: 369351
URL: http://svnweb.freebsd.org/changeset/ports/369351
QAT: https://qat.redports.org/buildarchive/r369351/
Log:
Install scan-view dependencies.
Tell the user the correct scan-view to run.
PR: 193955
Sponsored by: DARPA, AFRL
Modified:
head/lang/clang34/Makefile
head/lang/clang34/files/llvm-wrapper.sh.in
head/lang/clang34/files/patch-tools_clang_tools_scan-build_scan-build
head/lang/clang34/pkg-plist
Modified: head/lang/clang34/Makefile
==============================================================================
--- head/lang/clang34/Makefile Fri Sep 26 22:18:07 2014 (r369350)
+++ head/lang/clang34/Makefile Sat Sep 27 01:00:41 2014 (r369351)
@@ -2,6 +2,7 @@
PORTNAME= clang
DISTVERSION= 3.4.2
+PORTREVISION= 1
CATEGORIES= lang devel
MASTER_SITES= http://llvm.org/releases/${PORTVERSION}/
PKGNAMESUFFIX= ${LLVM_SUFFIX}
@@ -31,12 +32,12 @@ LLVM_SUFFIX= ${PORTVERSION:C/([0-9]\.[0-
LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX}
DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
+PYTHONLIBDIR= ${LLVM_PREFIX}/lib/python
GNU_CONFIGURE= yes
GNU_CONFIGURE_PREFIX= ${LLVM_PREFIX}
-USES= gmake perl5
+USES= gmake perl5 python
USE_LDCONFIG= yes
-USE_PYTHON_BUILD= yes
MAKE_ARGS= CLANG_TBLGEN=${WRKSRC}/${RELTYPE}/bin/clang-tblgen \
LLVMIncDir=${LLVM_PREFIX}/include \
@@ -109,6 +110,7 @@ post-patch:
${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|g' \
${WRKSRC}/tools/clang/lib/Frontend/InitHeaderSearch.cpp
${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}/|g' \
+ -e 's|%%LLVM_SUFFIX%%|${LLVM_SUFFIX}|g' \
${WRKSRC}/tools/clang/tools/scan-build/scan-build
pre-build:
@@ -122,9 +124,7 @@ pre-build:
post-build:
@cd ${WRKSRC}/tools/clang/docs/tools && ${MAKE_CMD} man
-.if ${PORT_OPTIONS:MDOCS}
@cd ${WRKSRC}/tools/clang/docs/tools && ${MAKE_CMD} html ps
-.endif
post-install:
${STRIP_CMD} ${STAGEDIR}${LLVM_PREFIX}/lib/libclang.so
@@ -146,10 +146,18 @@ post-install:
${LN} -f ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} \
${STAGEDIR}${PREFIX}/bin/${command}${LLVM_SUFFIX}
.endfor
-.if ${PORT_OPTIONS:MDOCS}
cd ${WRKSRC}/tools/clang/docs/tools && \
${MAKE_CMD} DESTDIR=${STAGEDIR}/ install-html install-ps
-.endif
+ ${MKDIR} ${STAGEDIR}${PYTHONLIBDIR}
+ ${MKDIR} ${STAGEDIR}${PYTHONLIBDIR}/Resources
+ ${INSTALL_SCRIPT} ${WRKSRC}/tools/clang/tools/scan-view/*.py \
+ ${STAGEDIR}${PYTHONLIBDIR}
+ ${INSTALL_SCRIPT} ${WRKSRC}/tools/clang/tools/scan-view/Resources/* \
+ ${STAGEDIR}${PYTHONLIBDIR}/Resources
+ ${MKDIR} ${STAGEDIR}${DATADIR}
+ ${INSTALL_DATA} ${WRKSRC}/tools/clang/tools/scan-build/scanview.css \
+ ${WRKSRC}/tools/clang/tools/scan-build/sorttable.js \
+ ${STAGEDIR}${DATADIR}
${INSTALL_MAN} ${WRKSRC}/tools/clang/docs/tools/clang.1 \
${STAGEDIR}${MANPREFIX}/man/man1/clang${LLVM_SUFFIX}.1
${INSTALL_MAN} ${WRKSRC}/tools/clang/tools/scan-build/scan-build.1 \
@@ -159,7 +167,8 @@ PLIST_FILE_LIST= ${COMMANDS:S|^|bin/|} \
lib/libclang*
PLIST_DIR_LIST= include/clang \
include/clang-c \
- lib/clang
+ lib/clang \
+ lib/python
build-plist:
${RM} -f ${PLIST}
Modified: head/lang/clang34/files/llvm-wrapper.sh.in
==============================================================================
--- head/lang/clang34/files/llvm-wrapper.sh.in Fri Sep 26 22:18:07 2014 (r369350)
+++ head/lang/clang34/files/llvm-wrapper.sh.in Sat Sep 27 01:00:41 2014 (r369351)
@@ -6,5 +6,6 @@ LLVM_SUFFIX="%%LLVM_SUFFIX%%"
tool=$(basename $0)
tool="${LLVM_PREFIX}/bin/${tool%${LLVM_SUFFIX}}"
+PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${LLVM_PREFIX}/lib/python" \
LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LLVM_PREFIX}/lib" \
"${tool}" "${@}"
Modified: head/lang/clang34/files/patch-tools_clang_tools_scan-build_scan-build
==============================================================================
--- head/lang/clang34/files/patch-tools_clang_tools_scan-build_scan-build Fri Sep 26 22:18:07 2014 (r369350)
+++ head/lang/clang34/files/patch-tools_clang_tools_scan-build_scan-build Sat Sep 27 01:00:41 2014 (r369351)
@@ -3,7 +3,7 @@ $FreeBSD$
--- tools/clang/tools/scan-build/scan-build.orig
+++ tools/clang/tools/scan-build/scan-build
-@@ -423,7 +423,7 @@
+@@ -419,7 +419,7 @@
my $Dir = shift;
@@ -12,7 +12,7 @@ $FreeBSD$
DieDiag("Cannot find 'sorttable.js'.\n")
if (! -r $JS);
-@@ -433,7 +433,7 @@
+@@ -429,7 +429,7 @@
DieDiag("Could not copy 'sorttable.js' to '$Dir'.\n")
if (! -r "$Dir/sorttable.js");
@@ -21,3 +21,12 @@ $FreeBSD$
DieDiag("Cannot find 'scanview.css'.\n")
if (! -r $CSS);
+@@ -853,7 +853,7 @@
+ my $Num = scalar(@Index);
+ Diag("$Num bugs found.\n");
+ if ($Num > 0 && -r "$Dir/index.html") {
+- Diag("Run 'scan-view $Dir' to examine bug reports.\n");
++ Diag("Run 'scan-view%%LLVM_SUFFIX%% $Dir' to examine bug reports.\n");
+ }
+
+ DiagCrashes($Dir) if (scalar @failures || scalar @attributes_ignored);
Modified: head/lang/clang34/pkg-plist
==============================================================================
--- head/lang/clang34/pkg-plist Fri Sep 26 22:18:07 2014 (r369350)
+++ head/lang/clang34/pkg-plist Sat Sep 27 01:00:41 2014 (r369351)
@@ -488,11 +488,19 @@ llvm%%LLVM_SUFFIX%%/lib/libclangStaticAn
llvm%%LLVM_SUFFIX%%/lib/libclangStaticAnalyzerCore.a
llvm%%LLVM_SUFFIX%%/lib/libclangStaticAnalyzerFrontend.a
llvm%%LLVM_SUFFIX%%/lib/libclangTooling.a
+llvm%%LLVM_SUFFIX%%/lib/python/Reporter.py
+llvm%%LLVM_SUFFIX%%/lib/python/Resources/FileRadar.scpt
+llvm%%LLVM_SUFFIX%%/lib/python/Resources/GetRadarVersion.scpt
+llvm%%LLVM_SUFFIX%%/lib/python/Resources/bugcatcher.ico
+llvm%%LLVM_SUFFIX%%/lib/python/ScanView.py
+llvm%%LLVM_SUFFIX%%/lib/python/startfile.py
man/man1/clang%%LLVM_SUFFIX%%.1.gz
man/man1/scan-build%%LLVM_SUFFIX%%.1.gz
%%PORTDOCS%%%%DOCSDIR%%/html/clang/clang.html
%%PORTDOCS%%%%DOCSDIR%%/html/clang/manpage.css
%%PORTDOCS%%%%DOCSDIR%%/ps/clang.ps
+ at dirrm llvm%%LLVM_SUFFIX%%/lib/python/Resources
+ at dirrm llvm%%LLVM_SUFFIX%%/lib/python
@dirrm llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2/include
@dirrm llvm%%LLVM_SUFFIX%%/lib/clang/3.4.2
@dirrm llvm%%LLVM_SUFFIX%%/lib/clang
More information about the svn-ports-head
mailing list