123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208 |
- --- libxslt-1.1.37.orig/m4/libtool.m4 2022-08-17 15:33:08.000000000 +0200
- +++ libxslt-1.1.37/m4/libtool.m4 2023-01-04 18:05:32.317244540 +0100
- @@ -728,6 +728,7 @@ _LT_CONFIG_SAVE_COMMANDS([
- cat <<_LT_EOF >> "$cfgfile"
- #! $SHELL
- # Generated automatically by $as_me ($PACKAGE) $VERSION
- +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
-
- # Provide generalized library-building support services.
- @@ -1041,8 +1042,8 @@ int forced_loaded() { return 2;}
- _LT_EOF
- echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
- $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
- - echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
- - $AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
- + echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
- + $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
- echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
- $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
- cat > conftest.c << _LT_EOF
- @@ -1492,7 +1493,7 @@ need_locks=$enable_libtool_lock
- m4_defun([_LT_PROG_AR],
- [AC_CHECK_TOOLS(AR, [ar], false)
- : ${AR=ar}
- -: ${AR_FLAGS=cr}
- +: ${AR_FLAGS=cru}
- _LT_DECL([], [AR], [1], [The archiver])
- _LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
-
- @@ -2886,18 +2887,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
- -netbsdelf*-gnu)
- - version_type=linux
- - need_lib_prefix=no
- - need_version=no
- - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- - soname_spec='${libname}${release}${shared_ext}$major'
- - shlibpath_var=LD_LIBRARY_PATH
- - shlibpath_overrides_runpath=no
- - hardcode_into_libs=yes
- - dynamic_linker='NetBSD ld.elf_so'
- - ;;
- -
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
- @@ -3557,7 +3546,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
- lt_cv_deplibs_check_method=pass_all
- ;;
-
- -netbsd* | netbsdelf*-gnu)
- +netbsd*)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
- else
- @@ -4063,8 +4052,7 @@ _LT_EOF
- if AC_TRY_EVAL(ac_compile); then
- # Now try to grab the symbols.
- nlist=conftest.nm
- - $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD
- - if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then
- + if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
- # Try sorting and uniquifying the output.
- if sort "$nlist" | uniq > "$nlist"T; then
- mv -f "$nlist"T "$nlist"
- @@ -4436,7 +4424,7 @@ m4_if([$1], [CXX], [
- ;;
- esac
- ;;
- - netbsd* | netbsdelf*-gnu)
- + netbsd*)
- ;;
- *qnx* | *nto*)
- # QNX uses GNU C++, but need to define -shared option too, otherwise
- @@ -4704,12 +4692,6 @@ m4_if([$1], [CXX], [
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
- ;;
- - # flang / f18. f95 an alias for gfortran or flang on Debian
- - flang* | f18* | f95*)
- - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
- - ;;
- # icc used to be incompatible with GCC.
- # ICC 10 doesn't accept -KPIC any more.
- icc* | ifort*)
- @@ -4954,9 +4936,6 @@ m4_if([$1], [CXX], [
- ;;
- esac
- ;;
- - linux* | k*bsd*-gnu | gnu*)
- - _LT_TAGVAR(link_all_deplibs, $1)=no
- - ;;
- *)
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
- @@ -4971,7 +4950,7 @@ m4_if([$1], [CXX], [
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
- _LT_TAGVAR(export_dynamic_flag_spec, $1)=
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- - _LT_TAGVAR(hardcode_automatic, $1)=no
- + _LT_TAGVAR(hardcode_automatic, $1)=yes
- _LT_TAGVAR(hardcode_direct, $1)=no
- _LT_TAGVAR(hardcode_direct_absolute, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
- @@ -5019,9 +4998,6 @@ dnl Note also adjust exclude_expsyms for
- openbsd* | bitrig*)
- with_gnu_ld=no
- ;;
- - linux* | k*bsd*-gnu | gnu*)
- - _LT_TAGVAR(link_all_deplibs, $1)=no
- - ;;
- esac
-
- _LT_TAGVAR(ld_shlibs, $1)=yes
- @@ -5276,7 +5252,7 @@ _LT_EOF
- fi
- ;;
-
- - netbsd* | netbsdelf*-gnu)
- + netbsd*)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
- @@ -5797,7 +5773,6 @@ _LT_EOF
- if test yes = "$lt_cv_irix_exported_symbol"; then
- _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'
- fi
- - _LT_TAGVAR(link_all_deplibs, $1)=no
- else
- _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'
- _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'
- @@ -5819,7 +5794,7 @@ _LT_EOF
- esac
- ;;
-
- - netbsd* | netbsdelf*-gnu)
- + netbsd*)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
- @@ -6333,7 +6308,7 @@ _LT_TAGVAR(hardcode_libdir_flag_spec, $1
- _LT_TAGVAR(hardcode_libdir_separator, $1)=
- _LT_TAGVAR(hardcode_minus_L, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- -_LT_TAGVAR(hardcode_automatic, $1)=no
- +_LT_TAGVAR(hardcode_automatic, $1)=yes
- _LT_TAGVAR(inherit_rpath, $1)=no
- _LT_TAGVAR(module_cmds, $1)=
- _LT_TAGVAR(module_expsym_cmds, $1)=
- @@ -6445,7 +6420,7 @@ if test yes != "$_lt_caught_CXX_error";
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
- + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
- else
- GXX=no
- @@ -6820,7 +6795,7 @@ if test yes != "$_lt_caught_CXX_error";
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- - 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"'
- + 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"'
- ;;
- *)
- if test yes = "$GXX"; then
- @@ -6885,7 +6860,7 @@ if test yes != "$_lt_caught_CXX_error";
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- - 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"'
- + 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"'
- ;;
- *)
- if test yes = "$GXX"; then
- @@ -7224,7 +7199,7 @@ if test yes != "$_lt_caught_CXX_error";
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
- + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
- else
- # FIXME: insert proper C++ library support
- @@ -7308,7 +7283,7 @@ if test yes != "$_lt_caught_CXX_error";
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
- + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
- else
- # g++ 2.7 appears to require '-G' NOT '-shared' on this
- # platform.
- @@ -7319,7 +7294,7 @@ if test yes != "$_lt_caught_CXX_error";
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
- + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
- fi
-
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
|