|
|
@@ -1,109 +0,0 @@
|
|
|
-From ce661985c098635965573aac8fc983a72f60d396 Mon Sep 17 00:00:00 2001
|
|
|
-From: Romain Naour <romain.naour@gmail.com>
|
|
|
-Date: Tue, 30 May 2017 16:42:34 +0200
|
|
|
-Subject: [PATCH] buildroot-libtool-v1.5.patch
|
|
|
-
|
|
|
-Apply buildroot-libtool-v1.5.patch rebased on libtool 1.5.2 used
|
|
|
-in madplay and fixing all conflicts.
|
|
|
-
|
|
|
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
|
|
----
|
|
|
- ltmain.sh | 40 ++++++++++++++++++++++++++++++----------
|
|
|
- 1 file changed, 30 insertions(+), 10 deletions(-)
|
|
|
-
|
|
|
-diff --git a/ltmain.sh b/ltmain.sh
|
|
|
-index 4b9f940..0b71220 100644
|
|
|
---- a/ltmain.sh
|
|
|
-+++ b/ltmain.sh
|
|
|
-@@ -164,6 +164,11 @@ do
|
|
|
- arg="$1"
|
|
|
- shift
|
|
|
-
|
|
|
-+ # Make -static behave as -all-static
|
|
|
-+ case $arg in
|
|
|
-+ -static) arg="-all-static" ;;
|
|
|
-+ esac
|
|
|
-+
|
|
|
- case $arg in
|
|
|
- -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
|
|
|
- *) optarg= ;;
|
|
|
-@@ -549,8 +554,9 @@ if test -z "$show_help"; then
|
|
|
- # line option must be used.
|
|
|
- if test -z "$tagname"; then
|
|
|
- $echo "$modename: unable to infer tagged configuration"
|
|
|
-- $echo "$modename: specify a tag with \`--tag'" 1>&2
|
|
|
-- exit 1
|
|
|
-+ $echo "$modename: defaulting to \`CC'"
|
|
|
-+ $echo "$modename: if this is not correct, specify a tag with \`--tag'"
|
|
|
-+# exit 1
|
|
|
- # else
|
|
|
- # $echo "$modename: using $tagname tagged configuration"
|
|
|
- fi
|
|
|
-@@ -1228,7 +1234,8 @@ EOF
|
|
|
- prevarg="$arg"
|
|
|
-
|
|
|
- case $arg in
|
|
|
-- -all-static)
|
|
|
-+ # Make -static behave like -all-static
|
|
|
-+ -all-static | -static)
|
|
|
- if test -n "$link_static_flag"; then
|
|
|
- compile_command="$compile_command $link_static_flag"
|
|
|
- finalize_command="$finalize_command $link_static_flag"
|
|
|
-@@ -2135,8 +2142,14 @@ EOF
|
|
|
- absdir="$abs_ladir"
|
|
|
- libdir="$abs_ladir"
|
|
|
- else
|
|
|
-- dir="$libdir"
|
|
|
-- absdir="$libdir"
|
|
|
-+ # Adding 'libdir' from the .la file to our library search paths
|
|
|
-+ # breaks crosscompilation horribly. We cheat here and don't add
|
|
|
-+ # it, instead adding the path where we found the .la. -CL
|
|
|
-+ dir="$abs_ladir"
|
|
|
-+ absdir="$abs_ladir"
|
|
|
-+ libdir="$abs_ladir"
|
|
|
-+ #dir="$libdir"
|
|
|
-+ #absdir="$libdir"
|
|
|
- fi
|
|
|
- else
|
|
|
- dir="$ladir/$objdir"
|
|
|
-@@ -2261,7 +2274,7 @@ EOF
|
|
|
- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
|
|
|
- if test "$installed" = no; then
|
|
|
- notinst_deplibs="$notinst_deplibs $lib"
|
|
|
-- need_relink=yes
|
|
|
-+ need_relink=no
|
|
|
- fi
|
|
|
- # This is a shared library
|
|
|
-
|
|
|
-@@ -5146,6 +5159,10 @@ fi\
|
|
|
- # 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)
|
|
|
- name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
|
|
|
-@@ -5464,10 +5481,13 @@ relink_command=\"$relink_command\""
|
|
|
- # 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.
|
|
|
-- if test "$inst_prefix_dir" = "$destdir"; then
|
|
|
-- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
|
|
|
-- exit 1
|
|
|
-- fi
|
|
|
-+ #
|
|
|
-+ # This breaks install into our staging area. -PB
|
|
|
-+ #
|
|
|
-+ # if test "$inst_prefix_dir" = "$destdir"; then
|
|
|
-+ # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
|
|
|
-+ # exit 1
|
|
|
-+ # fi
|
|
|
-
|
|
|
- if test -n "$inst_prefix_dir"; then
|
|
|
- # Stick the inst_prefix_dir data into the link command.
|
|
|
---
|
|
|
-2.9.4
|
|
|
-
|
Fabrice Fontaine