From owner-svn-ports-head@freebsd.org Sat Jul 30 23:42:50 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 64B24BA9806; Sat, 30 Jul 2016 23:42:50 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0DBAA168A; Sat, 30 Jul 2016 23:42:49 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6UNgnma067277; Sat, 30 Jul 2016 23:42:49 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6UNgndv067275; Sat, 30 Jul 2016 23:42:49 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201607302342.u6UNgndv067275@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Sat, 30 Jul 2016 23:42:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419336 - head/devel/llvm-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jul 2016 23:42:50 -0000 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