|
Added
Link Here
|
| 1 |
--- m4/libtool.m4.orig 2022-03-25 17:46:41.000000000 +0000 |
| 2 |
+++ m4/libtool.m4 2022-04-07 08:12:29.678317000 +0000 |
| 3 |
@@ -728,6 +728,7 @@ _LT_CONFIG_SAVE_COMMANDS([ |
| 4 |
cat <<_LT_EOF >> "$cfgfile" |
| 5 |
#! $SHELL |
| 6 |
# Generated automatically by $as_me ($PACKAGE) $VERSION |
| 7 |
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: |
| 8 |
# NOTE: Changes made to this file will be lost: look at ltmain.sh. |
| 9 |
|
| 10 |
# Provide generalized library-building support services. |
| 11 |
@@ -2886,18 +2887,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) |
| 12 |
dynamic_linker='GNU/Linux ld.so' |
| 13 |
;; |
| 14 |
|
| 15 |
-netbsdelf*-gnu) |
| 16 |
- version_type=linux |
| 17 |
- need_lib_prefix=no |
| 18 |
- need_version=no |
| 19 |
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
| 20 |
- soname_spec='${libname}${release}${shared_ext}$major' |
| 21 |
- shlibpath_var=LD_LIBRARY_PATH |
| 22 |
- shlibpath_overrides_runpath=no |
| 23 |
- hardcode_into_libs=yes |
| 24 |
- dynamic_linker='NetBSD ld.elf_so' |
| 25 |
- ;; |
| 26 |
- |
| 27 |
netbsd*) |
| 28 |
version_type=sunos |
| 29 |
need_lib_prefix=no |
| 30 |
@@ -3557,7 +3546,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) |
| 31 |
lt_cv_deplibs_check_method=pass_all |
| 32 |
;; |
| 33 |
|
| 34 |
-netbsd* | netbsdelf*-gnu) |
| 35 |
+netbsd*) |
| 36 |
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then |
| 37 |
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' |
| 38 |
else |
| 39 |
@@ -4063,8 +4052,7 @@ _LT_EOF |
| 40 |
if AC_TRY_EVAL(ac_compile); then |
| 41 |
# Now try to grab the symbols. |
| 42 |
nlist=conftest.nm |
| 43 |
- $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD |
| 44 |
- if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then |
| 45 |
+ if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then |
| 46 |
# Try sorting and uniquifying the output. |
| 47 |
if sort "$nlist" | uniq > "$nlist"T; then |
| 48 |
mv -f "$nlist"T "$nlist" |
| 49 |
@@ -4436,7 +4424,7 @@ m4_if([$1], [CXX], [ |
| 50 |
;; |
| 51 |
esac |
| 52 |
;; |
| 53 |
- netbsd* | netbsdelf*-gnu) |
| 54 |
+ netbsd*) |
| 55 |
;; |
| 56 |
*qnx* | *nto*) |
| 57 |
# QNX uses GNU C++, but need to define -shared option too, otherwise |
| 58 |
@@ -4948,9 +4936,6 @@ m4_if([$1], [CXX], [ |
| 59 |
;; |
| 60 |
esac |
| 61 |
;; |
| 62 |
- linux* | k*bsd*-gnu | gnu*) |
| 63 |
- _LT_TAGVAR(link_all_deplibs, $1)=no |
| 64 |
- ;; |
| 65 |
*) |
| 66 |
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
| 67 |
;; |
| 68 |
@@ -5013,9 +4998,6 @@ dnl Note also adjust exclude_expsyms for C++ above. |
| 69 |
openbsd* | bitrig*) |
| 70 |
with_gnu_ld=no |
| 71 |
;; |
| 72 |
- linux* | k*bsd*-gnu | gnu*) |
| 73 |
- _LT_TAGVAR(link_all_deplibs, $1)=no |
| 74 |
- ;; |
| 75 |
esac |
| 76 |
|
| 77 |
_LT_TAGVAR(ld_shlibs, $1)=yes |
| 78 |
@@ -5270,7 +5252,7 @@ _LT_EOF |
| 79 |
fi |
| 80 |
;; |
| 81 |
|
| 82 |
- netbsd* | netbsdelf*-gnu) |
| 83 |
+ netbsd*) |
| 84 |
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
| 85 |
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
| 86 |
wlarc= |
| 87 |
@@ -5791,7 +5773,6 @@ _LT_EOF |
| 88 |
if test yes = "$lt_cv_irix_exported_symbol"; then |
| 89 |
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' |
| 90 |
fi |
| 91 |
- _LT_TAGVAR(link_all_deplibs, $1)=no |
| 92 |
else |
| 93 |
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' |
| 94 |
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' |
| 95 |
@@ -5813,7 +5794,7 @@ _LT_EOF |
| 96 |
esac |
| 97 |
;; |
| 98 |
|
| 99 |
- netbsd* | netbsdelf*-gnu) |
| 100 |
+ netbsd*) |
| 101 |
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
| 102 |
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out |
| 103 |
else |
| 104 |
@@ -6439,7 +6420,7 @@ if test yes != "$_lt_caught_CXX_error"; then |
| 105 |
# Commands to make compiler produce verbose output that lists |
| 106 |
# what "hidden" libraries, object files and flags are used when |
| 107 |
# linking a shared library. |
| 108 |
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' |
| 109 |
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
| 110 |
|
| 111 |
else |
| 112 |
GXX=no |
| 113 |
@@ -6814,7 +6795,7 @@ if test yes != "$_lt_caught_CXX_error"; then |
| 114 |
# explicitly linking system object files so we need to strip them |
| 115 |
# from the output so that they don't get included in the library |
| 116 |
# dependencies. |
| 117 |
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' |
| 118 |
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' |
| 119 |
;; |
| 120 |
*) |
| 121 |
if test yes = "$GXX"; then |
| 122 |
@@ -6879,7 +6860,7 @@ if test yes != "$_lt_caught_CXX_error"; then |
| 123 |
# explicitly linking system object files so we need to strip them |
| 124 |
# from the output so that they don't get included in the library |
| 125 |
# dependencies. |
| 126 |
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' |
| 127 |
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' |
| 128 |
;; |
| 129 |
*) |
| 130 |
if test yes = "$GXX"; then |
| 131 |
@@ -7218,7 +7199,7 @@ if test yes != "$_lt_caught_CXX_error"; then |
| 132 |
# Commands to make compiler produce verbose output that lists |
| 133 |
# what "hidden" libraries, object files and flags are used when |
| 134 |
# linking a shared library. |
| 135 |
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' |
| 136 |
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
| 137 |
|
| 138 |
else |
| 139 |
# FIXME: insert proper C++ library support |
| 140 |
@@ -7302,7 +7283,7 @@ if test yes != "$_lt_caught_CXX_error"; then |
| 141 |
# Commands to make compiler produce verbose output that lists |
| 142 |
# what "hidden" libraries, object files and flags are used when |
| 143 |
# linking a shared library. |
| 144 |
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' |
| 145 |
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
| 146 |
else |
| 147 |
# g++ 2.7 appears to require '-G' NOT '-shared' on this |
| 148 |
# platform. |
| 149 |
@@ -7313,7 +7294,7 @@ if test yes != "$_lt_caught_CXX_error"; then |
| 150 |
# Commands to make compiler produce verbose output that lists |
| 151 |
# what "hidden" libraries, object files and flags are used when |
| 152 |
# linking a shared library. |
| 153 |
- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' |
| 154 |
+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' |
| 155 |
fi |
| 156 |
|
| 157 |
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' |