mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-01 21:23:51 -09:00
a185c81e94
Removed patch 0001 which is included in this release. Updated license hash and _LICENSE due to switch to LGPL-2.1+: https://savannah.gnu.org/news/?id=10139 https://gitweb.git.savannah.gnu.org/gitweb/?p=libiconv.git;a=commitdiff;h=3acb1179dd057fa37b733eb2827822f95d1e31c3 Our libtool patch does not apply due to the shipped file being patched upstream: https://gitweb.git.savannah.gnu.org/gitweb/?p=libiconv.git;a=commitdiff;h=2f2b617f0334cd8b4313bcd84ce6a49713a7d848 * build-aux/ltmain.sh: Update from libtool-2.5.4, with modifications: 2017-07-15 Bruno Haible <bruno@clisp.org> Allow building statically linked binaries, through LDFLAGS="-static". Apply patch from <https://lists.gnu.org/archive/html/bug-libtool/2017-07/msg00000.html>. * build-aux/ltmain.sh (func_mode_help, func_mode_link): In the link mode, accept option '-static-uninstalled-libs' in place of '-static', and make '-static' an equivalent of '-all-static'. * libcharset/build-aux/ltmain.sh: Likewise. Added 0001-libtool.patch as rebased version of support/libtool/buildroot-libtool-v2.4.4.patch Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Signed-off-by: Julien Olivain <ju.o@free.fr>
58 lines
2.1 KiB
Diff
58 lines
2.1 KiB
Diff
Libtool fixes for cross-compilation, many past contributors/authors.
|
|
Update based on libtool-2.4.4, useful for 2.4.3 as well but not 2.4.2.
|
|
|
|
Upstream: Not applicable (Buildroot specific)
|
|
|
|
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
|
[Bernd: rebased for version 1.18]
|
|
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
|
|
|
--- a/build-aux/ltmain.sh 2014-12-16 09:51:23.068441045 -0300
|
|
+++ b/build-aux/ltmain.sh 2014-12-16 09:57:10.509430339 -0300
|
|
@@ -2687,8 +2687,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"
|
|
- func_fatal_error "specify a tag with '--tag'"
|
|
+ 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
|
|
@@ -4277,8 +4277,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.
|
|
@@ -8112,7 +8112,7 @@
|
|
*)
|
|
if test no = "$installed"; then
|
|
func_append notinst_deplibs " $lib"
|
|
- need_relink=yes
|
|
+ need_relink=no
|
|
fi
|
|
;;
|
|
esac
|
|
@@ -10710,6 +10710,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"
|