svn commit: r409364 - head/devel/llvm38
Brooks Davis
brooks at FreeBSD.org
Mon Feb 22 19:20:03 UTC 2016
Author: brooks
Date: Mon Feb 22 19:20:02 2016
New Revision: 409364
URL: https://svnweb.freebsd.org/changeset/ports/409364
Log:
Fix a number of plist issues and add LLD to the list of things not to
build on older systems without clang.
Modified:
head/devel/llvm38/Makefile
head/devel/llvm38/pkg-plist
Modified: head/devel/llvm38/Makefile
==============================================================================
--- head/devel/llvm38/Makefile Mon Feb 22 19:00:36 2016 (r409363)
+++ head/devel/llvm38/Makefile Mon Feb 22 19:20:02 2016 (r409364)
@@ -114,8 +114,10 @@ STRIP_LIBS= BugpointPasses.so \
EXTRAS_COMMANDS+= \
clang-apply-replacements \
clang-modernize \
+ clang-query \
clang-rename \
- clang-tidy
+ clang-tidy \
+ modularize
EXTRAS_LIBS= libclangApplyReplacements \
libclangQuery \
libclangRename \
@@ -147,23 +149,12 @@ MAN1SRCS+= clang.1 \
CLANG_PATTERN= (c-index-test|clang|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|-analyzer)
.endif
-.if ${PORT_OPTIONS:MEXTRAS}
-COMMANDS+= ${EXTRAS_COMMANDS}
-MAN1SRCS+= extraclangtools.1
-PORTDOCS+= clang-tools
-.endif
-
.if ${PORT_OPTIONS:MLIT}
MAN1SRCS+= lit.1 FileCheck.1
_USES_PYTHON= python
LIT_COMMANDS= lit llvm-lit FileCheck
.endif
-.if ${PORT_OPTIONS:MLLD}
-COMMANDS+= lld
-PORTDOCS+= lld
-.endif
-
.if ${PORT_OPTIONS:MLLDB}
COMMANDS+= argdumper \
lldb \
@@ -192,6 +183,19 @@ NOT_FOR_ARCH= ia64
.include <bsd.port.pre.mk>
+.if ${OPSYS} != "FreeBSD" || ${COMPILER_TYPE} == clang
+.if ${PORT_OPTIONS:MEXTRAS}
+COMMANDS+= ${EXTRAS_COMMANDS}
+MAN1SRCS+= extraclangtools.1
+PORTDOCS+= clang-tools
+.endif
+
+.if ${PORT_OPTIONS:MLLD}
+COMMANDS+= lld
+PORTDOCS+= lld
+.endif
+.endif
+
.if ${PYTHON_REL} < 3400
LLDB_BUILD_DEPENDS+= \
${PYTHON_PKGNAMEPREFIX}enum34>0:${PORTSDIR}/devel/py-enum34
@@ -203,7 +207,8 @@ BROKEN= LLDB does not build with Python
.if ${OPSYS} == "FreeBSD" && ${COMPILER_TYPE} != clang
# Evil hack around gcc48 not providing a usable c++11 environment on 9.x
-PLIST_SUB:= ${PLIST_SUB:NLLDB=*} LLDB="@comment "
+PLIST_SUB:= ${PLIST_SUB:NEXTRAS=*} EXTRAS="@comment "
+PLIST_SUB:= ${PLIST_SUB:NLLD=*} LLD="@comment "
PLIST_SUB:= ${PLIST_SUB:NLLDB=*} LLDB="@comment "
.endif
@@ -216,7 +221,9 @@ post-extract-EXTRAS-on:
.endif
post-extract-LLD-on:
+.if ${OPSYS} != "FreeBSD" || ${COMPILER_TYPE} == clang
${MV} ${WRKSRC_lld} ${PATCH_WRKSRC}/tools/lld
+.endif
post-extract-LLDB-on:
.if ${OPSYS} != "FreeBSD" || ${COMPILER_TYPE} == clang
@@ -315,7 +322,7 @@ build-plist:
if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /(omp.h|libclang_rt|sanitizer|blacklist.txt|${EXTRAS_PATTERN})/) {printf "%%%%CLANG%%%%"} \
if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \
if ($$0 ~ /lld/ && $$0 !~ /lldb/) {printf "%%%%LLD%%%%"} \
- if ($$0 ~ /(argdumper|lldb)/) {printf "%%%%LLDB%%%%"} \
+ if ($$0 ~ /(argdumper|lldb|six.py)/) {printf "%%%%LLDB%%%%"} \
if ($$0 ~ /lib.*omp/) {printf "%%%%OPENMP%%%%"} \
if ($$0 ~ /LLVMgold/) {printf "%%%%GOLD%%%%"} \
if ($$0 !~ /libclang_rt/) {print}}' ${PLIST}.tmp >> ${PLIST}
Modified: head/devel/llvm38/pkg-plist
==============================================================================
--- head/devel/llvm38/pkg-plist Mon Feb 22 19:00:36 2016 (r409363)
+++ head/devel/llvm38/pkg-plist Mon Feb 22 19:20:02 2016 (r409364)
@@ -34,15 +34,17 @@ bin/opt38
%%CLANG%%bin/clang-tblgen38
%%CLANG%%bin/scan-build38
%%CLANG%%bin/scan-view38
-%%EXTRAS%%bin/clang-apply-replacements38
-%%EXTRAS%%bin/clang-modernize38
-%%EXTRAS%%bin/clang-rename38
-%%EXTRAS%%bin/clang-tidy38
%%LLD%%bin/lld38
%%LLDB%%bin/argdumper38
%%LLDB%%bin/lldb38
%%LLDB%%bin/lldb-mi38
%%LLDB%%bin/lldb-server38
+%%EXTRAS%%bin/clang-apply-replacements38
+%%EXTRAS%%bin/clang-modernize38
+%%EXTRAS%%bin/clang-query38
+%%EXTRAS%%bin/clang-rename38
+%%EXTRAS%%bin/clang-tidy38
+%%EXTRAS%%bin/modularize38
%%LIT%%bin/lit38
%%LIT%%llvm38/bin/lit
%%LIT%%bin/llvm-lit38
@@ -59,7 +61,7 @@ llvm38/bin/bugpoint
%%CLANG%%llvm38/bin/clang-cl
%%CLANG%%llvm38/bin/clang-cpp
%%CLANG%%llvm38/bin/clang-format
-%%CLANG%%llvm38/bin/clang-query
+%%EXTRAS%%llvm38/bin/clang-query
%%EXTRAS%%llvm38/bin/clang-rename
%%CLANG%%llvm38/bin/clang-tblgen
%%EXTRAS%%llvm38/bin/clang-tidy
@@ -106,7 +108,7 @@ llvm38/bin/llvm-split
llvm38/bin/llvm-stress
llvm38/bin/llvm-symbolizer
llvm38/bin/llvm-tblgen
-llvm38/bin/modularize
+%%EXTRAS%%llvm38/bin/modularize
llvm38/bin/obj2yaml
llvm38/bin/opt
llvm38/bin/sancov
@@ -2209,7 +2211,7 @@ llvm38/lib/libLTO.so
%%LLDB%%llvm38/lib/python2.7/site-packages/lldb/runtime/__init__.py
%%LLDB%%llvm38/lib/python2.7/site-packages/lldb/utils/__init__.py
%%LLDB%%llvm38/lib/python2.7/site-packages/lldb/utils/symbolication.py
-llvm38/lib/python2.7/site-packages/six.py
+%%LLDB%%llvm38/lib/python2.7/site-packages/six.py
%%CLANG%%llvm38/libexec/c++-analyzer
%%CLANG%%llvm38/libexec/ccc-analyzer
%%CLANG%%llvm38/share/clang/clang-format-bbedit.applescript
More information about the svn-ports-all
mailing list