blob: ece3134ce9d58db49d2c23c03b942233878dd805 [file]
Libtool fixes for cross-compilation, many past contributors/authors.
Update based on libtool-2.6.0.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
--- a/ltmain.sh 2026-10-11 09:19:50.195676649 +0200
+++ b/ltmain.sh 2026-10-11 09:20:44.054085154 +0200
@@ -3015,9 +3015,8 @@
# was found and let the user know that the "--tag" command
# line option must be used.
if test -z "$tagname"; then
- func_echo "unable to infer tagged configuration with compiler."
- func_echo "Possible use of unsupported compiler."
- func_fatal_error "specify a tag with '--tag'. For more information, try '$progname --help'."
+ func_echo "defaulting to \`CC'"
+ func_echo "if this is not correct, specify a tag with \`--tag'"
# else
# func_verbose "using $tagname tagged configuration"
fi
@@ -4753,8 +4752,12 @@
# At present, this check doesn't affect windows .dll's that
# are installed into $libdir/../bin (currently, that works fine)
# but it's something to keep an eye on.
- test "$inst_prefix_dir" = "$destdir" && \
- func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
+
+ #
+ # This breaks install into our staging area. -PB
+ #
+ #test "$inst_prefix_dir" = "$destdir" && \
+ # func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
@@ -7062,7 +7065,8 @@
;;
-all-static | -static | -static-libtool-libs)
case $arg in
- -all-static)
+ # Make -static behave like -all-static -GZ
+ -all-static | -static)
if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then
func_warning "complete static linking is impossible in this configuration"
fi
@@ -7071,12 +7075,6 @@
fi
prefer_static_libs=yes
;;
- -static)
- if test -z "$pic_flag" && test -n "$link_static_flag"; then
- dlopen_self=$dlopen_self_static
- fi
- prefer_static_libs=built
- ;;
-static-libtool-libs)
if test -z "$pic_flag" && test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
@@ -7382,7 +7380,8 @@
prevarg=$arg
case $arg in
- -all-static)
+ # Make -static behave like -all-static -GZ
+ -all-static | -static)
if test -n "$link_static_flag"; then
# See comment for -static flag below, for more details.
func_append compile_command " $link_static_flag"
@@ -7684,7 +7683,7 @@
continue
;;
- -static | -static-libtool-libs)
+ -static-libtool-libs)
# The effects of -static are defined in a previous loop.
# We used to do the same as -all-static on platforms that
# didn't have a PIC flag, but the assumption that the effects
@@ -8718,7 +8717,7 @@
*)
if test no = "$installed"; then
func_append notinst_deplibs " $lib"
- need_relink=yes
+ need_relink=no
fi
;;
esac
@@ -11247,6 +11246,10 @@
# Replace all uninstalled libtool libraries with the installed ones
newdependency_libs=
for deplib in $dependency_libs; do
+ # Replacing uninstalled with installed can easily break crosscompilation,
+ # since the installed path is generally the wrong architecture. -CL
+ newdependency_libs="$newdependency_libs $deplib"
+ continue
case $deplib in
*.la)
func_basename "$deplib"