From 627aa2948546d208d31458ab37898239b244e599 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Fri, 4 Mar 2016 08:31:38 -0500 Subject: [PATCH] autogen: fix deprecated construct Newer versions of Perl warn that unescaped left braces in regexps are deprecated. (cherry picked from commit open-mpi/ompi@9c9bad3db58d003d531b4a46cfc7cfece778a0e6) --- autogen.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/autogen.pl b/autogen.pl index 0cedf66e01..b9ab787d1a 100755 --- a/autogen.pl +++ b/autogen.pl @@ -1,6 +1,6 @@ #!/usr/bin/env perl # -# Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2009-2016 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2013 Mellanox Technologies, Inc. # All rights reserved. @@ -1001,9 +1001,9 @@ sub patch_autotools_output { # https://github.com/open-mpi/ompi/issues/751 push(@verbose_out, $indent_str . "Patching configure for libtool.m4 bug\n"); # patch for libtool < 2.4.3 - $c =~ s/# Some compilers place space between "-{L,R}" and the path.\n # Remove the space.\n if test \$p = \"-L\" \|\|/# Some compilers place space between "-{L,-l,R}" and the path.\n # Remove the spaces.\n if test \$p = \"-L\" \|\|\n test \$p = \"-l\" \|\|/g; + $c =~ s/# Some compilers place space between "-\{L,R\}" and the path.\n # Remove the space.\n if test \$p = \"-L\" \|\|/# Some compilers place space between "-\{L,-l,R\}" and the path.\n # Remove the spaces.\n if test \$p = \"-L\" \|\|\n test \$p = \"-l\" \|\|/g; # patch for libtool >= 2.4.3 - $c =~ s/# Some compilers place space between "-{L,R}" and the path.\n # Remove the space.\n if test x-L = \"\$p\" \|\|\n test x-R = \"\$p\"\; then/# Some compilers place space between "-{L,-l,R}" and the path.\n # Remove the spaces.\n if test x-L = \"x\$p\" \|\|\n test x-l = \"x\$p\" \|\|\n test x-R = \"x\$p\"\; then/g; + $c =~ s/# Some compilers place space between "-\{L,R\}" and the path.\n # Remove the space.\n if test x-L = \"\$p\" \|\|\n test x-R = \"\$p\"\; then/# Some compilers place space between "-\{L,-l,R\}" and the path.\n # Remove the spaces.\n if test x-L = \"x\$p\" \|\|\n test x-l = \"x\$p\" \|\|\n test x-R = \"x\$p\"\; then/g; # Only write out verbose statements and a new configure if the # configure content actually changed