From 67fdfdda7da8f94448ea4e5fc51e05128fdfce10 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Fri, 7 Aug 2015 11:47:32 +0900 Subject: [PATCH] configury: patch generated configure files to fix the libtool.m4 bug the bug started with libtool 2.4.3 Fixes open-mpi/ompi#751 --- autogen.pl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/autogen.pl b/autogen.pl index e728c90145..979f19e42c 100755 --- a/autogen.pl +++ b/autogen.pl @@ -5,6 +5,8 @@ # Copyright (c) 2013 Mellanox Technologies, Inc. # All rights reserved. # Copyright (c) 2013-2014 Intel, Inc. All rights reserved. +# Copyright (c) 2015 Research Organization for Information Science +# and Technology (RIST). All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -978,6 +980,12 @@ sub patch_autotools_output { push(@verbose_out, $indent_str . "Patching configure for IBM xlf libtool bug\n"); $c =~ s/(\$LD -shared \$libobjs \$deplibs \$)compiler_flags( -soname \$soname)/$1linker_flags$2/g; + # Fix consequence of broken libtool.m4 from libtool 2.4.3 + # see http://lists.gnu.org/archive/html/bug-libtool/2015-07/msg00002.html + push(@verbose_out, $indent_str . "Patching configure for libtool.m4 bug\n"); + $c =~ s/test x-L = \"\$p\"/test x-L = \"x\$p\"/g; + $c =~ s/test x-R = \"\$p\"/test x-R = \"x\$p\"/g; + # Only write out verbose statements and a new configure if the # configure content actually changed return