patch-m4_libtool_m4 10 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208
  1. --- libxslt-1.1.37.orig/m4/libtool.m4 2022-08-17 15:33:08.000000000 +0200
  2. +++ libxslt-1.1.37/m4/libtool.m4 2023-01-04 18:05:32.317244540 +0100
  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. # Provide generalized library-building support services.
  10. @@ -1041,8 +1042,8 @@ int forced_loaded() { return 2;}
  11. _LT_EOF
  12. echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
  13. $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
  14. - echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
  15. - $AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
  16. + echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
  17. + $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
  18. echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
  19. $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
  20. cat > conftest.c << _LT_EOF
  21. @@ -1492,7 +1493,7 @@ need_locks=$enable_libtool_lock
  22. m4_defun([_LT_PROG_AR],
  23. [AC_CHECK_TOOLS(AR, [ar], false)
  24. : ${AR=ar}
  25. -: ${AR_FLAGS=cr}
  26. +: ${AR_FLAGS=cru}
  27. _LT_DECL([], [AR], [1], [The archiver])
  28. _LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
  29. @@ -2886,18 +2887,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
  30. dynamic_linker='GNU/Linux ld.so'
  31. ;;
  32. -netbsdelf*-gnu)
  33. - version_type=linux
  34. - need_lib_prefix=no
  35. - need_version=no
  36. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
  37. - soname_spec='${libname}${release}${shared_ext}$major'
  38. - shlibpath_var=LD_LIBRARY_PATH
  39. - shlibpath_overrides_runpath=no
  40. - hardcode_into_libs=yes
  41. - dynamic_linker='NetBSD ld.elf_so'
  42. - ;;
  43. -
  44. netbsd*)
  45. version_type=sunos
  46. need_lib_prefix=no
  47. @@ -3557,7 +3546,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
  48. lt_cv_deplibs_check_method=pass_all
  49. ;;
  50. -netbsd* | netbsdelf*-gnu)
  51. +netbsd*)
  52. if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
  53. lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
  54. else
  55. @@ -4063,8 +4052,7 @@ _LT_EOF
  56. if AC_TRY_EVAL(ac_compile); then
  57. # Now try to grab the symbols.
  58. nlist=conftest.nm
  59. - $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD
  60. - if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then
  61. + if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
  62. # Try sorting and uniquifying the output.
  63. if sort "$nlist" | uniq > "$nlist"T; then
  64. mv -f "$nlist"T "$nlist"
  65. @@ -4436,7 +4424,7 @@ m4_if([$1], [CXX], [
  66. ;;
  67. esac
  68. ;;
  69. - netbsd* | netbsdelf*-gnu)
  70. + netbsd*)
  71. ;;
  72. *qnx* | *nto*)
  73. # QNX uses GNU C++, but need to define -shared option too, otherwise
  74. @@ -4704,12 +4692,6 @@ m4_if([$1], [CXX], [
  75. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
  76. _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
  77. ;;
  78. - # flang / f18. f95 an alias for gfortran or flang on Debian
  79. - flang* | f18* | f95*)
  80. - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
  81. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
  82. - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
  83. - ;;
  84. # icc used to be incompatible with GCC.
  85. # ICC 10 doesn't accept -KPIC any more.
  86. icc* | ifort*)
  87. @@ -4954,9 +4936,6 @@ m4_if([$1], [CXX], [
  88. ;;
  89. esac
  90. ;;
  91. - linux* | k*bsd*-gnu | gnu*)
  92. - _LT_TAGVAR(link_all_deplibs, $1)=no
  93. - ;;
  94. *)
  95. _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
  96. ;;
  97. @@ -4971,7 +4950,7 @@ m4_if([$1], [CXX], [
  98. _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
  99. _LT_TAGVAR(export_dynamic_flag_spec, $1)=
  100. _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
  101. - _LT_TAGVAR(hardcode_automatic, $1)=no
  102. + _LT_TAGVAR(hardcode_automatic, $1)=yes
  103. _LT_TAGVAR(hardcode_direct, $1)=no
  104. _LT_TAGVAR(hardcode_direct_absolute, $1)=no
  105. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
  106. @@ -5019,9 +4998,6 @@ dnl Note also adjust exclude_expsyms for
  107. openbsd* | bitrig*)
  108. with_gnu_ld=no
  109. ;;
  110. - linux* | k*bsd*-gnu | gnu*)
  111. - _LT_TAGVAR(link_all_deplibs, $1)=no
  112. - ;;
  113. esac
  114. _LT_TAGVAR(ld_shlibs, $1)=yes
  115. @@ -5276,7 +5252,7 @@ _LT_EOF
  116. fi
  117. ;;
  118. - netbsd* | netbsdelf*-gnu)
  119. + netbsd*)
  120. if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
  121. _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  122. wlarc=
  123. @@ -5797,7 +5773,6 @@ _LT_EOF
  124. if test yes = "$lt_cv_irix_exported_symbol"; then
  125. _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'
  126. fi
  127. - _LT_TAGVAR(link_all_deplibs, $1)=no
  128. else
  129. _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'
  130. _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'
  131. @@ -5819,7 +5794,7 @@ _LT_EOF
  132. esac
  133. ;;
  134. - netbsd* | netbsdelf*-gnu)
  135. + netbsd*)
  136. if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
  137. _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
  138. else
  139. @@ -6333,7 +6308,7 @@ _LT_TAGVAR(hardcode_libdir_flag_spec, $1
  140. _LT_TAGVAR(hardcode_libdir_separator, $1)=
  141. _LT_TAGVAR(hardcode_minus_L, $1)=no
  142. _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
  143. -_LT_TAGVAR(hardcode_automatic, $1)=no
  144. +_LT_TAGVAR(hardcode_automatic, $1)=yes
  145. _LT_TAGVAR(inherit_rpath, $1)=no
  146. _LT_TAGVAR(module_cmds, $1)=
  147. _LT_TAGVAR(module_expsym_cmds, $1)=
  148. @@ -6445,7 +6420,7 @@ if test yes != "$_lt_caught_CXX_error";
  149. # Commands to make compiler produce verbose output that lists
  150. # what "hidden" libraries, object files and flags are used when
  151. # linking a shared library.
  152. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
  153. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
  154. else
  155. GXX=no
  156. @@ -6820,7 +6795,7 @@ if test yes != "$_lt_caught_CXX_error";
  157. # explicitly linking system object files so we need to strip them
  158. # from the output so that they don't get included in the library
  159. # dependencies.
  160. - 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"'
  161. + 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"'
  162. ;;
  163. *)
  164. if test yes = "$GXX"; then
  165. @@ -6885,7 +6860,7 @@ if test yes != "$_lt_caught_CXX_error";
  166. # explicitly linking system object files so we need to strip them
  167. # from the output so that they don't get included in the library
  168. # dependencies.
  169. - 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"'
  170. + 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"'
  171. ;;
  172. *)
  173. if test yes = "$GXX"; then
  174. @@ -7224,7 +7199,7 @@ if test yes != "$_lt_caught_CXX_error";
  175. # Commands to make compiler produce verbose output that lists
  176. # what "hidden" libraries, object files and flags are used when
  177. # linking a shared library.
  178. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
  179. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
  180. else
  181. # FIXME: insert proper C++ library support
  182. @@ -7308,7 +7283,7 @@ if test yes != "$_lt_caught_CXX_error";
  183. # Commands to make compiler produce verbose output that lists
  184. # what "hidden" libraries, object files and flags are used when
  185. # linking a shared library.
  186. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
  187. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
  188. else
  189. # g++ 2.7 appears to require '-G' NOT '-shared' on this
  190. # platform.
  191. @@ -7319,7 +7294,7 @@ if test yes != "$_lt_caught_CXX_error";
  192. # Commands to make compiler produce verbose output that lists
  193. # what "hidden" libraries, object files and flags are used when
  194. # linking a shared library.
  195. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
  196. + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
  197. fi
  198. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'