Skip to content
This repository was archived by the owner on Sep 30, 2022. It is now read-only.

Commit 4740cb0

Browse files
ggouaillardetjsquyres
authored andcommitted
configury: fix libtool.m4 issue for Libtool >= v2.4.3
Patch generated configure files to fix the libtool.m4 bug the bug that started with Libtool 2.4.3. (cherry picked from commit open-mpi/ompi@67fdfdd)
1 parent 8ae8b78 commit 4740cb0

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

autogen.pl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
# Copyright (c) 2013 Mellanox Technologies, Inc.
66
# All rights reserved.
77
# Copyright (c) 2013-2014 Intel, Inc. All rights reserved.
8+
# Copyright (c) 2015 Research Organization for Information Science
9+
# and Technology (RIST). All rights reserved.
810
# $COPYRIGHT$
911
#
1012
# Additional copyrights may follow
@@ -978,6 +980,12 @@ sub patch_autotools_output {
978980
push(@verbose_out, $indent_str . "Patching configure for IBM xlf libtool bug\n");
979981
$c =~ s/(\$LD -shared \$libobjs \$deplibs \$)compiler_flags( -soname \$soname)/$1linker_flags$2/g;
980982

983+
# Fix consequence of broken libtool.m4 from libtool 2.4.3
984+
# see http://lists.gnu.org/archive/html/bug-libtool/2015-07/msg00002.html
985+
push(@verbose_out, $indent_str . "Patching configure for libtool.m4 bug\n");
986+
$c =~ s/test x-L = \"\$p\"/test x-L = \"x\$p\"/g;
987+
$c =~ s/test x-R = \"\$p\"/test x-R = \"x\$p\"/g;
988+
981989
# Only write out verbose statements and a new configure if the
982990
# configure content actually changed
983991
return

0 commit comments

Comments
 (0)