Date: Sat, 30 Jul 2016 23:42:49 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419336 - head/devel/llvm-devel Message-ID: <201607302342.u6UNgndv067275@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Sat Jul 30 23:42:48 2016 New Revision: 419336 URL: https://svnweb.freebsd.org/changeset/ports/419336 Log: Fix a plist generation bug that broke the !COMPILER_RT case. PR: 211422 Also reported by: marino Modified: head/devel/llvm-devel/Makefile head/devel/llvm-devel/pkg-plist Modified: head/devel/llvm-devel/Makefile ============================================================================== --- head/devel/llvm-devel/Makefile Sat Jul 30 22:38:24 2016 (r419335) +++ head/devel/llvm-devel/Makefile Sat Jul 30 23:42:48 2016 (r419336) @@ -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%%%%"} \ Modified: head/devel/llvm-devel/pkg-plist ============================================================================== --- head/devel/llvm-devel/pkg-plist Sat Jul 30 22:38:24 2016 (r419335) +++ head/devel/llvm-devel/pkg-plist Sat Jul 30 23:42:48 2016 (r419336) @@ -2077,7 +2077,7 @@ llvm-devel/include/llvm/Transforms/Vecto %%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607302342.u6UNgndv067275>