patch generated configure to fix an other libtool bug.
Thanks to Eric Schnetter for reporting this issue and providing a fix.
Этот коммит содержится в:
родитель
4bfc6ae798
Коммит
4c15560e49
11
autogen.pl
11
autogen.pl
@ -980,11 +980,14 @@ sub patch_autotools_output {
|
|||||||
push(@verbose_out, $indent_str . "Patching configure for IBM xlf libtool bug\n");
|
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;
|
$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
|
# Fix consequence of broken libtool.m4
|
||||||
# see http://lists.gnu.org/archive/html/bug-libtool/2015-07/msg00002.html
|
# see http://lists.gnu.org/archive/html/bug-libtool/2015-07/msg00002.html and
|
||||||
|
# https://github.com/open-mpi/ompi/issues/751
|
||||||
push(@verbose_out, $indent_str . "Patching configure for libtool.m4 bug\n");
|
push(@verbose_out, $indent_str . "Patching configure for libtool.m4 bug\n");
|
||||||
$c =~ s/test x-L = \"\$p\"/test x-L = \"x\$p\"/g;
|
# patch for libtool < 2.4.3
|
||||||
$c =~ s/test x-R = \"\$p\"/test x-R = \"x\$p\"/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;
|
||||||
|
|
||||||
# Only write out verbose statements and a new configure if the
|
# Only write out verbose statements and a new configure if the
|
||||||
# configure content actually changed
|
# configure content actually changed
|
||||||
|
Загрузка…
Ссылка в новой задаче
Block a user