From owner-svn-ports-all@freebsd.org  Sat May 21 06:20:16 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 88439B44816;
 Sat, 21 May 2016 06:20:16 +0000 (UTC)
 (envelope-from antoine@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 2AC031C9F;
 Sat, 21 May 2016 06:20:16 +0000 (UTC)
 (envelope-from antoine@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4L6KF59018603;
 Sat, 21 May 2016 06:20:15 GMT (envelope-from antoine@FreeBSD.org)
Received: (from antoine@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4L6KFFg018601;
 Sat, 21 May 2016 06:20:15 GMT (envelope-from antoine@FreeBSD.org)
Message-Id: <201605210620.u4L6KFFg018601@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: antoine set sender to
 antoine@FreeBSD.org using -f
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Sat, 21 May 2016 06:20:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r415585 - in head/devel/llvm37: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 May 2016 06:20:16 -0000

Author: antoine
Date: Sat May 21 06:20:14 2016
New Revision: 415585
URL: https://svnweb.freebsd.org/changeset/ports/415585

Log:
  Fix patching when OPENMP is disabled
  
  Reported by:	pkg-fallout

Added:
  head/devel/llvm37/files/openmp-patch-tools_openmp_runtime_tools_expand-vars.pl
     - copied unchanged from r415584, head/devel/llvm37/files/patch-tools_openmp_runtime_tools_expand-vars.pl
Deleted:
  head/devel/llvm37/files/patch-tools_openmp_runtime_tools_expand-vars.pl
Modified:
  head/devel/llvm37/Makefile

Modified: head/devel/llvm37/Makefile
==============================================================================
--- head/devel/llvm37/Makefile	Sat May 21 03:35:50 2016	(r415584)
+++ head/devel/llvm37/Makefile	Sat May 21 06:20:14 2016	(r415585)
@@ -68,6 +68,8 @@ LLDB_BUILD_DEPENDS=	swig:devel/swig13
 LLDB_DISTFILES=		lldb-${DISTVERSION}.src${EXTRACT_SUFX}
 OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
 OPENMP_DISTFILES=	openmp-${DISTVERSION}.src${EXTRACT_SUFX}
+OPENMP_EXTRA_PATCHES= \
+	${PATCHDIR}/openmp-patch-tools_openmp_runtime_tools_expand-vars.pl
 GOLD_DESC=		Build the LLVM Gold plugin for LTO
 GOLD_CMAKE_ON=		-DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include
 GOLD_BUILD_DEPENDS=	ld.gold:devel/binutils

Copied: head/devel/llvm37/files/openmp-patch-tools_openmp_runtime_tools_expand-vars.pl (from r415584, head/devel/llvm37/files/patch-tools_openmp_runtime_tools_expand-vars.pl)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/llvm37/files/openmp-patch-tools_openmp_runtime_tools_expand-vars.pl	Sat May 21 06:20:14 2016	(r415585, copy of r415584, head/devel/llvm37/files/patch-tools_openmp_runtime_tools_expand-vars.pl)
@@ -0,0 +1,11 @@
+--- tools/openmp/runtime/tools/expand-vars.pl.orig	2014-02-24 10:40:15 UTC
++++ tools/openmp/runtime/tools/expand-vars.pl
+@@ -113,7 +113,7 @@ $bulk = read_file( $input );
+ 
+ # Do the replacements.
+ $bulk =~
+-    s{(?:\$($keyword_rexp)|\$($name_rexp)|\${{(.*?)}})}
++    s{(?:\$($keyword_rexp)|\$($name_rexp)|\$\{\{(.*?)\}\})}
+     {
+         my $value;
+         if ( defined( $1 ) ) {