From 089f1841eef43908e1db2fb62db7572132f79e14 Mon Sep 17 00:00:00 2001
From: Jonathan Hui <jonhui@nestlabs.com>
Date: Tue, 13 Dec 2016 18:24:23 -0800
Subject: [PATCH] Escape literal "{" in a regular expression pattern. (#1060)

- To support changes introduced with perl-5.21.3.
---
 .../repo/tools/host/i686-pc-cygwin/bin/automake                 | 2 +-
 .../repo/tools/host/i686-pc-linux-gnu/bin/automake              | 2 +-
 .../repo/tools/host/x86_64-apple-darwin/bin/automake            | 2 +-
 .../repo/tools/host/x86_64-unknown-linux-gnu/bin/automake       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/third_party/nlbuild-autotools/repo/tools/host/i686-pc-cygwin/bin/automake b/third_party/nlbuild-autotools/repo/tools/host/i686-pc-cygwin/bin/automake
index 9c74dd31d..c7f9cea7f 100755
--- a/third_party/nlbuild-autotools/repo/tools/host/i686-pc-cygwin/bin/automake
+++ b/third_party/nlbuild-autotools/repo/tools/host/i686-pc-cygwin/bin/automake
@@ -3927,7 +3927,7 @@ sub substitute_ac_subst_variables_worker
 sub substitute_ac_subst_variables
 {
   my ($text) = @_;
-  $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
+  $text =~ s/\$\{([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
   return $text;
 }
 
diff --git a/third_party/nlbuild-autotools/repo/tools/host/i686-pc-linux-gnu/bin/automake b/third_party/nlbuild-autotools/repo/tools/host/i686-pc-linux-gnu/bin/automake
index 9c74dd31d..c7f9cea7f 100755
--- a/third_party/nlbuild-autotools/repo/tools/host/i686-pc-linux-gnu/bin/automake
+++ b/third_party/nlbuild-autotools/repo/tools/host/i686-pc-linux-gnu/bin/automake
@@ -3927,7 +3927,7 @@ sub substitute_ac_subst_variables_worker
 sub substitute_ac_subst_variables
 {
   my ($text) = @_;
-  $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
+  $text =~ s/\$\{([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
   return $text;
 }
 
diff --git a/third_party/nlbuild-autotools/repo/tools/host/x86_64-apple-darwin/bin/automake b/third_party/nlbuild-autotools/repo/tools/host/x86_64-apple-darwin/bin/automake
index 9c74dd31d..c7f9cea7f 100755
--- a/third_party/nlbuild-autotools/repo/tools/host/x86_64-apple-darwin/bin/automake
+++ b/third_party/nlbuild-autotools/repo/tools/host/x86_64-apple-darwin/bin/automake
@@ -3927,7 +3927,7 @@ sub substitute_ac_subst_variables_worker
 sub substitute_ac_subst_variables
 {
   my ($text) = @_;
-  $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
+  $text =~ s/\$\{([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
   return $text;
 }
 
diff --git a/third_party/nlbuild-autotools/repo/tools/host/x86_64-unknown-linux-gnu/bin/automake b/third_party/nlbuild-autotools/repo/tools/host/x86_64-unknown-linux-gnu/bin/automake
index 9c74dd31d..c7f9cea7f 100755
--- a/third_party/nlbuild-autotools/repo/tools/host/x86_64-unknown-linux-gnu/bin/automake
+++ b/third_party/nlbuild-autotools/repo/tools/host/x86_64-unknown-linux-gnu/bin/automake
@@ -3927,7 +3927,7 @@ sub substitute_ac_subst_variables_worker
 sub substitute_ac_subst_variables
 {
   my ($text) = @_;
-  $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
+  $text =~ s/\$\{([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
   return $text;
 }