generated from gaoyang3513/SDK_RK3288
[Mod] First commit
This commit is contained in:
91
support/libtool/buildroot-libtool-v1.5.patch
Normal file
91
support/libtool/buildroot-libtool-v1.5.patch
Normal file
@ -0,0 +1,91 @@
|
||||
--- a/ltmain.sh 2014-07-31 10:43:01.634568799 -0300
|
||||
+++ b/ltmain.sh 2014-07-31 10:44:14.032018999 -0300
|
||||
@@ -226,8 +226,9 @@
|
||||
# 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 $EXIT_FAILURE
|
||||
+ $echo "$modename: defaulting to \`CC'"
|
||||
+ $echo "$modename: if this is not correct, specify a tag with \`--tag'"
|
||||
+# exit $EXIT_FAILURE
|
||||
# else
|
||||
# $echo "$modename: using $tagname tagged configuration"
|
||||
fi
|
||||
@@ -247,6 +248,11 @@
|
||||
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= ;;
|
||||
@@ -1238,7 +1244,8 @@
|
||||
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"
|
||||
@@ -2146,8 +2153,14 @@
|
||||
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"
|
||||
@@ -2272,7 +2285,7 @@
|
||||
{ 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
|
||||
|
||||
@@ -5169,6 +5182,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)
|
||||
name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
|
||||
@@ -5487,10 +5504,13 @@
|
||||
# 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 $EXIT_FAILURE
|
||||
- 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 $EXIT_FAILURE
|
||||
+ # fi
|
||||
|
||||
if test -n "$inst_prefix_dir"; then
|
||||
# Stick the inst_prefix_dir data into the link command.
|
||||
106
support/libtool/buildroot-libtool-v2.2.patch
Normal file
106
support/libtool/buildroot-libtool-v2.2.patch
Normal file
@ -0,0 +1,106 @@
|
||||
--- a/ltmain.sh 2010-06-09 15:08:53.000000000 +0200
|
||||
+++ b/ltmain.sh 2014-07-30 22:33:41.176710372 +0200
|
||||
@@ -1214,8 +1214,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
|
||||
@@ -2239,8 +2239,11 @@
|
||||
# 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.
|
||||
@@ -4429,7 +4432,8 @@
|
||||
;;
|
||||
-all-static | -static | -static-libtool-libs)
|
||||
case $arg in
|
||||
- -all-static)
|
||||
+ # Make -static behave like -all-static
|
||||
+ -all-static | -static)
|
||||
if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
|
||||
func_warning "complete static linking is impossible in this configuration"
|
||||
fi
|
||||
@@ -4438,12 +4442,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
|
||||
@@ -4726,7 +4724,8 @@
|
||||
prevarg="$arg"
|
||||
|
||||
case $arg in
|
||||
- -all-static)
|
||||
+ # Make -static behave like -all-static
|
||||
+ -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"
|
||||
@@ -4995,7 +4994,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
|
||||
@@ -5739,8 +5738,14 @@
|
||||
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
|
||||
test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
|
||||
else
|
||||
@@ -5891,7 +5896,7 @@
|
||||
*)
|
||||
if test "$installed" = no; then
|
||||
notinst_deplibs="$notinst_deplibs $lib"
|
||||
- need_relink=yes
|
||||
+ need_relink=no
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
@@ -8373,6 +8378,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"
|
||||
95
support/libtool/buildroot-libtool-v2.4.4.patch
Normal file
95
support/libtool/buildroot-libtool-v2.4.4.patch
Normal file
@ -0,0 +1,95 @@
|
||||
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.
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
--- a/ltmain.sh 2014-12-16 09:51:23.068441045 -0300
|
||||
+++ b/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.
|
||||
@@ -6550,7 +6554,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
|
||||
@@ -6559,12 +6564,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
|
||||
@@ -6858,7 +6857,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"
|
||||
@@ -7149,7 +7149,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
|
||||
@@ -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"
|
||||
89
support/libtool/buildroot-libtool-v2.4.patch
Normal file
89
support/libtool/buildroot-libtool-v2.4.patch
Normal file
@ -0,0 +1,89 @@
|
||||
--- a/ltmain.sh 2014-07-30 22:21:24.664684143 +0200
|
||||
+++ b/ltmain.sh 2014-07-30 22:23:02.440687625 +0200
|
||||
@@ -1417,8 +1417,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
|
||||
@@ -2963,8 +2963,11 @@
|
||||
# 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.
|
||||
@@ -5176,7 +5179,8 @@
|
||||
;;
|
||||
-all-static | -static | -static-libtool-libs)
|
||||
case $arg in
|
||||
- -all-static)
|
||||
+ # Make -static behave like -all-static
|
||||
+ -all-static | -static)
|
||||
if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
|
||||
func_warning "complete static linking is impossible in this configuration"
|
||||
fi
|
||||
@@ -5185,12 +5189,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
|
||||
@@ -5473,7 +5471,8 @@
|
||||
prevarg="$arg"
|
||||
|
||||
case $arg in
|
||||
- -all-static)
|
||||
+ # Make -static behave like -all-static
|
||||
+ -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"
|
||||
@@ -5754,7 +5753,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
|
||||
@@ -6697,7 +6696,7 @@
|
||||
*)
|
||||
if test "$installed" = no; then
|
||||
func_append notinst_deplibs " $lib"
|
||||
- need_relink=yes
|
||||
+ need_relink=no
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
@@ -9275,6 +9274,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"
|
||||
Reference in New Issue
Block a user