From c8e53b72be3a2ab09c36717eb0920fe761196f25 Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin <sergey.kosukhin@mpimet.mpg.de> Date: Fri, 27 Mar 2020 15:08:12 +0100 Subject: [PATCH] Update libtool patches. --- patch/libtool.m4.arg_spaces.patch | 2 +- patch/libtool.m4.nag_wrapper.patch | 2 +- patch/ltmain.sh.nag_pthread.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/patch/libtool.m4.arg_spaces.patch b/patch/libtool.m4.arg_spaces.patch index a33a6c282..fa8e0d811 100644 --- a/patch/libtool.m4.arg_spaces.patch +++ b/patch/libtool.m4.arg_spaces.patch @@ -1,6 +1,6 @@ --- a/m4/libtool.m4 +++ b/m4/libtool.m4 -@@ -7532,10 +7532,11 @@ if AC_TRY_EVAL(ac_compile); then +@@ -7538,10 +7538,11 @@ if AC_TRY_EVAL(ac_compile); then case $prev$p in -L* | -R* | -l*) diff --git a/patch/libtool.m4.nag_wrapper.patch b/patch/libtool.m4.nag_wrapper.patch index c19b7a69b..fcbb07539 100644 --- a/patch/libtool.m4.nag_wrapper.patch +++ b/patch/libtool.m4.nag_wrapper.patch @@ -1,6 +1,6 @@ --- a/config/ltmain.sh +++ b/config/ltmain.sh -@@ -8903,7 +8903,8 @@ func_mode_link () +@@ -8881,7 +8881,8 @@ func_mode_link () xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" # On Darwin other compilers diff --git a/patch/ltmain.sh.nag_pthread.patch b/patch/ltmain.sh.nag_pthread.patch index cff281e88..4ec874715 100644 --- a/patch/ltmain.sh.nag_pthread.patch +++ b/patch/ltmain.sh.nag_pthread.patch @@ -14,7 +14,7 @@ for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do case " $new_inherited_linker_flags " in *" $tmp_inherited_linker_flag "*) ;; -@@ -9493,6 +9500,22 @@ EOF +@@ -9494,6 +9501,22 @@ EOF ;; esac -- GitLab