svn commit: r415585 - in head/devel/llvm37: . files

[Antoine Brodin]

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 ) ) {