diff options
| author | brooks <brooks@FreeBSD.org> | 2016-07-31 07:42:48 +0800 |
|---|---|---|
| committer | brooks <brooks@FreeBSD.org> | 2016-07-31 07:42:48 +0800 |
| commit | 8049a69f1f0ade03a50a7efb9483253cc7044fbd (patch) | |
| tree | adccfee332d5cb87bed732eec826024c6167174e /devel | |
| parent | 03072295381376a90aeee91a8fe9837c1554d9f4 (diff) | |
| download | freebsd-ports-gnome-8049a69f1f0ade03a50a7efb9483253cc7044fbd.tar.gz freebsd-ports-gnome-8049a69f1f0ade03a50a7efb9483253cc7044fbd.tar.zst freebsd-ports-gnome-8049a69f1f0ade03a50a7efb9483253cc7044fbd.zip | |
Fix a plist generation bug that broke the !COMPILER_RT case.
PR: 211422
Also reported by: marino
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/llvm-devel/Makefile | 7 | ||||
| -rw-r--r-- | devel/llvm-devel/pkg-plist | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile index a8da125aa080..eca18a999e7f 100644 --- a/devel/llvm-devel/Makefile +++ b/devel/llvm-devel/Makefile @@ -3,6 +3,7 @@ PORTNAME= llvm PORTVERSION= ${LLVM_MAJOR}.d${SNAPDATE} +PORTREVISION= 1 CATEGORIES= devel lang PKGNAMESUFFIX= -devel @@ -160,6 +161,10 @@ 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:MCOMPILER_RT} +COMPILER_RT_PATTERN= (asan_blacklist.txt|sanitizer|xray) +.endif + .if ${PORT_OPTIONS:MLIT} MAN1SRCS+= lit.1 FileCheck.1 _USES_PYTHON= python @@ -373,7 +378,7 @@ build-plist: ${SORT} >> ${PLIST}.tmp awk '{ \ if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /omp.h|${EXTRAS_PATTERN}|libclang_rt/) {printf "%%%%CLANG%%%%"} \ - if ($$0 ~ /asan_blacklist.txt|sanitizer/) \ + if ($$0 ~ /${COMPILER_RT_PATTERN}/) \ {printf "%%%%COMPILER_RT%%%%"} \ if ($$0 ~ /lld/ && $$0 !~ /lldb/) {printf "%%%%LLD%%%%"} \ if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \ diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist index 63aae3aa8f44..cacc9c2bdc73 100644 --- a/devel/llvm-devel/pkg-plist +++ b/devel/llvm-devel/pkg-plist @@ -2077,7 +2077,7 @@ llvm-devel/include/llvm/Transforms/Vectorize/SLPVectorizer.h %%COMPILER_RT%%llvm-devel/include/sanitizer/lsan_interface.h %%COMPILER_RT%%llvm-devel/include/sanitizer/msan_interface.h %%COMPILER_RT%%llvm-devel/include/sanitizer/tsan_interface_atomic.h -llvm-devel/include/xray/xray_interface.h +%%COMPILER_RT%%llvm-devel/include/xray/xray_interface.h llvm-devel/lib/BugpointPasses.so llvm-devel/lib/LLVMHello.so %%GOLD%%llvm-devel/lib/LLVMgold.so |