From 2cdcb2dbe99dfc855725c82326840ba7fff13267 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 10 Aug 2026 19:52:24 +0200 Subject: [PATCH] Upgrade to libtool 2.6.2. * m4/libtool.m4: Update from libtool-2.6.2. * m4/ltoptions.m4: Likewise. * m4/ltsugar.m4: Likewise. * m4/ltversion.m4: Likewise. * m4/lt~obsolete.m4: Likewise. * build-aux/ltmain.sh: Likewise. --- build-aux/ltmain.sh | 134 +++++++++++++++++++++++++++++++----------- m4/libtool.m4 | 140 ++++++++++++++++++++++++++++++-------------- m4/ltoptions.m4 | 2 +- m4/ltsugar.m4 | 2 +- m4/ltversion.m4 | 12 ++-- m4/lt~obsolete.m4 | 2 +- 6 files changed, 203 insertions(+), 89 deletions(-) diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh index b1ba2d3b0..b84a6849c 100644 --- a/build-aux/ltmain.sh +++ b/build-aux/ltmain.sh @@ -2,11 +2,11 @@ ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in ## by inline-source v2019-02-19.15 -# libtool (GNU libtool) 2.6.0 +# libtool (GNU libtool) 2.6.2 # Provide generalized library-building support services. # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996-2019, 2021-2025 Free Software Foundation, Inc. +# Copyright (C) 1996-2019, 2021-2026 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -26,13 +26,13 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . PROGRAM=libtool PACKAGE=libtool -VERSION=2.6.0 -package_revision=2.6.0 +VERSION=2.6.2 +package_revision=2.6.2 ## ------ ## @@ -2215,7 +2215,7 @@ func_version () # End: # Set a version string. -scriptversion='(GNU libtool) 2.6.0' +scriptversion='(GNU libtool) 2.6.2' # func_version # ------------ @@ -2342,7 +2342,7 @@ include the following information: autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` Report bugs to . -GNU libtool home page: . +GNU libtool home page: . General help using GNU software: ." exit 0 } @@ -2737,8 +2737,8 @@ libtool_validate_options () test : = "$debug_cmd" || func_append preserve_args " --debug" case $host_os in - # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 - # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 + # Solaris2 added to fix https://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 + # see also: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 cygwin* | mingw* | windows* | pw32* | cegcc* | solaris2* | os2* | *linux*) # don't eliminate duplications in $postdeps and $predeps opt_duplicate_compiler_generated_deps=: @@ -3204,11 +3204,11 @@ func_convert_core_msys_to_w32_with_cygpath () # Since MSYS2 is packaged with cygpath, call cygpath in $PATH; no need # to use LT_CYGPATH in this case. - func_convert_core_msys_to_w32_result=`cygpath "$@" 2>/dev/null | + func_convert_core_msys_to_w32_with_cygpath_result=`cygpath "$@" 2>/dev/null | $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"` if test "$?" -ne 0; then # on failure, ensure result is empty - func_convert_core_msys_to_w32_result= + func_convert_core_msys_to_w32_with_cygpath_result= fi } #end: func_convert_core_msys_to_w32_with_cygpath @@ -5655,7 +5655,7 @@ func_extract_archives () $RM -rf unfat-$$ cd "$darwin_orig_dir" else - cd $darwin_orig_dir + cd "$darwin_orig_dir" func_extract_an_archive "$my_xdir" "$my_xabs" fi # $darwin_arches } # !$opt_dry_run @@ -6988,7 +6988,15 @@ func_mode_link () # even a static library is built. For now, we need to specify # -no-undefined on the libtool link line when we can be certain # that all symbols are satisfied, otherwise we get a static library. - allow_undefined=yes + case $host in + *-*-os2*) + # OS/2 does not allow undefined symbols at all when linking a dll. + allow_undefined=no + ;; + *) + allow_undefined=yes + ;; + esac ;; *) allow_undefined=yes @@ -7060,7 +7068,7 @@ func_mode_link () build_old_libs=no break ;; - -all-static | -static | -static-libtool-libs) + -all-static | -static | -static-libtool-libs | --static | -Bstatic) case $arg in -all-static) if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then @@ -7077,7 +7085,7 @@ func_mode_link () fi prefer_static_libs=built ;; - -static-libtool-libs) + -static-libtool-libs | --static | -Bstatic) if test -z "$pic_flag" && test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi @@ -7094,6 +7102,16 @@ func_mode_link () # See if our shared archives depend on static archives. test -n "$old_archive_from_new_cmds" && build_old_libs=yes + # make sure "-Xpreprocessor -fopenmp" is processed as one token + case $@ in + *-Xpreprocessor\ -fopenmp*) + fopenmp_match="-Xpreprocessor -fopenmp" + ;; + *) + fopenmp_match=-fopenmp + ;; + esac + # Go through the arguments, transforming them on the way. while test "$#" -gt 0; do arg=$1 @@ -7583,7 +7601,7 @@ func_mode_link () continue ;; -mt|-mthreads|-kthread|-Kthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-fopenmp=*|-openmp|-mp|-xopenmp|-omp|-qsmp=*) + |-threads|$fopenmp_match|fopenmp=*|-openmp|-mp|-xopenmp|-omp|-qsmp=*) func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -7810,6 +7828,7 @@ func_mode_link () # -fuse-ld=* Linker select flags for GCC # -static-* direct GCC to link specific libraries statically # -fcilkplus Cilk Plus language extension features for C/C++ + # -resource-dir=* for selecting compiler resource directory with clang # -rtlib=* select c runtime lib with clang # --unwindlib=* select unwinder library with clang # -f{file|debug|macro|profile}-prefix-map=* needed for lto linking @@ -7818,7 +7837,7 @@ func_mode_link () -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*|--target=*| \ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-no-canonical-prefixes| \ - -stdlib=*|-rtlib=*|--unwindlib=*| \ + -stdlib=*|-resource-dir=*|-rtlib=*|--unwindlib=*| \ -specs=*|-fsanitize=*|-fno-sanitize*|-shared-libsan|-static-libsan| \ -ffile-prefix-map=*|-fdebug-prefix-map=*|-fmacro-prefix-map=*|-fprofile-prefix-map=*| \ -fdiagnostics-color*|-frecord-gcc-switches| \ @@ -7944,10 +7963,9 @@ func_mode_link () fi ;; - *.$libext) - # An archive. + *.$libext|*.so) + # An archive or an explicit shared library. func_append deplibs " $arg" - func_append old_deplibs " $arg" continue ;; @@ -8173,7 +8191,7 @@ func_mode_link () continue ;; -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-fopenmp=*|-openmp|-mp|-xopenmp|-omp|-qsmp=*) + |-threads|$fopenmp_match|fopenmp=*|-openmp|-mp|-xopenmp|-omp|-qsmp=*) if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" @@ -8323,10 +8341,31 @@ func_mode_link () func_resolve_sysroot "$deplib" lib=$func_resolve_sysroot_result ;; + *.so) + case $linkmode,$pass in + lib,*) + deplibs="$deplib $deplibs" + newdependency_libs="$deplib $newdependency_libs" + ;; + prog,link) + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + ;; + prog,*) + deplibs="$deplib $deplibs" + ;; + *) + func_warning "'$deplib' is ignored for archives/objects" + ;; + esac + continue + ;; *.$libext) if test conv = "$pass"; then deplibs="$deplib $deplibs" continue + else + func_append old_deplibs " $deplib" fi case $linkmode in lib) @@ -8357,7 +8396,9 @@ func_mode_link () ;; esac if $valid_a_lib; then - func_warning "Linking the shared library $output against the static library $deplib is not portable!" + if test yes != "$build_old_libs"; then + func_warning "Linking the shared library $output against the static library $deplib is not portable!" + fi deplibs="$deplib $deplibs" else func_warning "Trying to link with static lib archive $deplib." @@ -8459,19 +8500,19 @@ func_mode_link () # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_preserve_dup_deps; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done elif test prog != "$linkmode" && test lib != "$linkmode"; then func_fatal_error "'$lib' is not a convenience library" fi - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done continue fi # $pass = conv @@ -9296,7 +9337,6 @@ func_mode_link () # Now set the variables for building old libraries. build_libtool_libs=no oldlibs=$output - func_append objs "$old_deplibs" ;; lib) @@ -11019,7 +11059,13 @@ func_mode_link () # compiling, it, like the target executable, must be # executed on the $host or under an emulation environment. $opt_dry_run || { - $LTCC $LTCFLAGS -o $cwrapper $cwrappersource + func_cc_basename "$LTCC" + case $func_cc_basename_result in + cl|cl.exe) + $LTCC $LTCFLAGS -Fe$cwrapper $cwrappersource ;; + *) + $LTCC $LTCFLAGS -o $cwrapper $cwrappersource ;; + esac $STRIP $cwrapper } @@ -11064,7 +11110,11 @@ func_mode_link () build_libtool_libs=no ;; *) - oldobjs="$old_deplibs $non_pic_objects" + oldobjs=$non_pic_objects + # This is not correct to add old_deplibs creating an archive + # so append them only when creating an executable or a shared + # library. + test yes != "$build_old_libs" && oldobjs="$oldobjs $old_deplibs" $preload && test -f "$symfileobj" \ && func_append oldobjs " $symfileobj" addlibs=$old_convenience @@ -11325,6 +11375,20 @@ func_mode_link () done dlprefiles=$newdlprefiles fi + + # Forward old library dependencies only when no shared + # library is being built. When building the shared library, + # the linker uses $deplibs to link the archives into it, but + # then we don't want to add it as transitive dependency. + if test -z "$library_names"; then + for lib in $old_deplibs; do + case $lib in + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; + *) abs=`pwd`"/$lib" ;; + esac + func_append dependency_libs " $abs" + done + fi $RM $output # place dlname in correct position for cygwin # In fact, it would be nice if we could use this code for all target diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 5ccb3a813..96e6c7d05 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -1,6 +1,6 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996-2001, 2003-2019, 2021-2025 Free Software +# Copyright (C) 1996-2001, 2003-2019, 2021-2026 Free Software # Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # @@ -9,7 +9,7 @@ # modifications, as long as this notice is preserved. m4_define([_LT_COPYING], [dnl -# Copyright (C) 2025 Free Software Foundation, Inc. +# Copyright (C) 2025-2026 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -29,10 +29,10 @@ m4_define([_LT_COPYING], [dnl # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . ]) -# serial 66 LT_INIT +# serial 67 LT_INIT # LT_PREREQ(VERSION) @@ -534,7 +534,38 @@ m4_defun([_LT_OBJECTIVE_C], [ ) objc_compiles=$lt_cv_objc_compiles _LT_DECL([], [objc_compiles], [1], - [Check for compiling Objective C and C++ code]) + [Check for compiling Objective C code]) +]) + +# _LT_OBJECTIVE_CXX +# ------------------------------ +m4_defun([_LT_OBJECTIVE_CXX], [ + AC_CACHE_CHECK([for Objective C++ compilation], + [lt_cv_objcxx_compiles], + [ save_CFLAGS=$CFLAGS + CFLAGS=$OBJCXXFLAGS + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([#import +@interface Addition : NSObject +- (int)this:(int)a that:(int)b; +@end + +@implementation Addition +- (int)this:(int)a that:(int)b +{ + return a + b; +} +@end +],[])], + lt_cv_objcxx_compiles=yes, + lt_cv_objcxx_compiles=no + ) + CFLAGS=$save_CFLAGS + ] + ) + objcxx_compiles=$lt_cv_objcxx_compiles + _LT_DECL([], [objcxx_compiles], [1], + [Check for compiling Objective C++ code]) ]) m4_defun([_LT_ML64], [ @@ -701,7 +732,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2025 Free Software Foundation, Inc. +Copyright (C) 2025-2026 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -3016,7 +3047,7 @@ linux*android*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | ironclad*-gnu | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -3142,9 +3173,14 @@ os2*) need_lib_prefix=no # OS/2 can only load a DLL with a base name of 8 characters or less. soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; - v=$($ECHO $release$versuffix | tr -d .-); - n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); - $ECHO $n$v`$shared_ext' + n=$($ECHO $libname | tr -d .-); + l=${#n}; test 3 -lt "$l" && l=3; mr=$((8 - $l)); + r=$($ECHO $release | tr -d .-); + l=${#r}; test 2 -lt "$l" && l=2; mv=$(($mr - $l)); + v=$($ECHO $versuffix | tr -d .- | cut -b -$mv); + r=$($ECHO $r | cut -b -$(($mr - ${#v}))); + n=$($ECHO $n | cut -b -$((8 - ${#r} - ${#v}))); + $ECHO $n$r$v`$shared_ext' library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' shlibpath_var=BEGINLIBPATH @@ -3766,7 +3802,7 @@ irix5* | irix6* | nonstopux*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | ironclad*-gnu | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -4593,7 +4629,7 @@ m4_if([$1], [CXX], [ ;; *-mlibc) ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | ironclad*-gnu | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4925,7 +4961,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu* | freebsd*) + linux* | ironclad*-gnu | k*bsd*-gnu | kopensolaris*-gnu | gnu* | freebsd*) case $cc_basename in # old Intel for x86_64, which still supported -KPIC. ecc*) @@ -4964,6 +5000,12 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; + slimcc*) + # Hsiang-Ying Fu and Jim Huang's x86_64 SlimCC compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -5384,17 +5426,17 @@ _LT_EOF _LT_TAGVAR(hardcode_minus_L, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)=unsupported shrext_cmds=.dll - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ + _LT_TAGVAR(archive_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + echo EXPORTS >> $output_objdir/$libname.def~ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ emximp -o $lib $output_objdir/$libname.def' - _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + echo EXPORTS >> $output_objdir/$libname.def~ prefix_cmds="$SED"~ if test EXPORTS = "`$SED 1q $export_symbols`"; then prefix_cmds="$prefix_cmds -e 1d"; @@ -5403,7 +5445,6 @@ _LT_EOF cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ emximp -o $lib $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes _LT_TAGVAR(file_list_spec, $1)='@' ;; @@ -5428,7 +5469,7 @@ _LT_EOF _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; - gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + gnu* | linux* | tpf* | ironclad*-gnu | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no if test linux-dietlibc = "$host_os"; then case $cc_basename in @@ -6106,17 +6147,17 @@ _LT_EOF _LT_TAGVAR(hardcode_minus_L, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)=unsupported shrext_cmds=.dll - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ + _LT_TAGVAR(archive_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + echo EXPORTS >> $output_objdir/$libname.def~ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ emximp -o $lib $output_objdir/$libname.def' - _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + echo EXPORTS >> $output_objdir/$libname.def~ prefix_cmds="$SED"~ if test EXPORTS = "`$SED 1q $export_symbols`"; then prefix_cmds="$prefix_cmds -e 1d"; @@ -6125,7 +6166,6 @@ _LT_EOF cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ emximp -o $lib $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes _LT_TAGVAR(file_list_spec, $1)='@' ;; @@ -6985,17 +7025,17 @@ if test yes != "$_lt_caught_CXX_error"; then _LT_TAGVAR(hardcode_minus_L, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)=unsupported shrext_cmds=.dll - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ + _LT_TAGVAR(archive_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + echo EXPORTS >> $output_objdir/$libname.def~ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ emximp -o $lib $output_objdir/$libname.def' - _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ - $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ - $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ - $ECHO EXPORTS >> $output_objdir/$libname.def~ + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + echo "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + echo EXPORTS >> $output_objdir/$libname.def~ prefix_cmds="$SED"~ if test EXPORTS = "`$SED 1q $export_symbols`"; then prefix_cmds="$prefix_cmds -e 1d"; @@ -7004,7 +7044,6 @@ if test yes != "$_lt_caught_CXX_error"; then cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ emximp -o $lib $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes _LT_TAGVAR(file_list_spec, $1)='@' ;; @@ -7208,7 +7247,7 @@ if test yes != "$_lt_caught_CXX_error"; then _LT_TAGVAR(ld_shlibs, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | ironclad*-gnu | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -7665,6 +7704,14 @@ if test yes != "$_lt_caught_CXX_error"; then _LT_TAGVAR(ld_shlibs, $1)=no ;; + emscripten*) + # Emscripten side modules (-sSIDE_MODULE=2) use a separate PIC sysroot + # and do not link system libraries (they are imported from the main module + # at runtime). Re-run the verbose link with -sSIDE_MODULE=2 so that the + # detected paths point to the PIC sysroot instead of the non-PIC one. + output_verbose_link_cmd='$CC -sSIDE_MODULE=2 -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP " [[-]]L"' + ;; + *) # FIXME: insert proper C++ library support _LT_TAGVAR(ld_shlibs, $1)=no @@ -8529,7 +8576,10 @@ _LT_COMPILER_BOILERPLATE _LT_LINKER_BOILERPLATE # Check for compilation issues with OBJCXX flags -_LT_OBJECTIVE_C +_LT_OBJECTIVE_CXX +if test "yes" = "$lt_cv_gnustep_exists"; then + OBJCXXFLAGS="$OBJCXXFLAGS `gnustep-config --objc-flags`" +fi # Allow CC to be a program name with arguments. lt_save_CC=$CC @@ -8637,7 +8687,7 @@ AC_DEFUN([LT_PROG_OBJC], if test Xgnustep-config = X"$GNUSTEP_CONFIG"; then test set = "${OBJCFLAGS+set}" || OBJCFLAGS="`gnustep-config --objc-flags`" fi - AC_SUBST(OBJCFLAGS)])])[]dnl + AC_SUBST(OBJCFLAGS)[]dnl ]) # LT_PROG_OBJCXX @@ -8648,7 +8698,7 @@ AC_DEFUN([LT_PROG_OBJCXX], if test Xgnustep-config = X"$GNUSTEP_CONFIG"; then test set = "${OBJCXXFLAGS+set}" || OBJCXXFLAGS="`gnustep-config --objc-flags`" fi - AC_SUBST(OBJCXXFLAGS)])])[]dnl + AC_SUBST(OBJCXXFLAGS)[]dnl ]) # LT_PROG_GCJ diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4 index 9e93e6f04..994d4487b 100644 --- a/m4/ltoptions.m4 +++ b/m4/ltoptions.m4 @@ -1,6 +1,6 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2025 Free +# Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2026 Free # Software Foundation, Inc. # Written by Gary V. Vaughan, 2004 # diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4 index 5698955ba..a15a50726 100644 --- a/m4/ltsugar.m4 +++ b/m4/ltsugar.m4 @@ -1,6 +1,6 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2025 Free Software +# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2026 Free Software # Foundation, Inc. # Written by Gary V. Vaughan, 2004 # diff --git a/m4/ltversion.m4 b/m4/ltversion.m4 index 09bdaa5ee..656867a7c 100644 --- a/m4/ltversion.m4 +++ b/m4/ltversion.m4 @@ -1,6 +1,6 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004, 2011-2019, 2021-2025 Free Software Foundation, +# Copyright (C) 2004, 2011-2019, 2021-2026 Free Software Foundation, # Inc. # Written by Scott James Remnant, 2004 # @@ -10,15 +10,15 @@ # @configure_input@ -# serial 4509 ltversion.m4 +# serial 4547 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.6.0]) -m4_define([LT_PACKAGE_REVISION], [2.6.0]) +m4_define([LT_PACKAGE_VERSION], [2.6.2]) +m4_define([LT_PACKAGE_REVISION], [2.6.2]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.6.0' -macro_revision='2.6.0' +[macro_version='2.6.2' +macro_revision='2.6.2' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4 index c1d7729b4..cadcdbe46 100644 --- a/m4/lt~obsolete.m4 +++ b/m4/lt~obsolete.m4 @@ -1,6 +1,6 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007, 2009, 2011-2019, 2021-2025 Free +# Copyright (C) 2004-2005, 2007, 2009, 2011-2019, 2021-2026 Free # Software Foundation, Inc. # Written by Scott James Remnant, 2004. # -- 2.47.3