aboutsummaryrefslogtreecommitdiff
path: root/support
diff options
context:
space:
mode:
authorGravatar Gustavo Zacarias <gustavo@zacarias.com.ar>2014-12-16 11:08:15 -0300
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-12-21 13:21:56 +0100
commit4a28e3523d600ae5eef091373cf52de80c550b15 (patch)
tree07d9712aa840e3c5f0f2b209fc1c8650348c9f9c /support
parentc7007963882baa61361a9905771a68077ae2d695 (diff)
downloadbuildroot-4a28e3523d600ae5eef091373cf52de80c550b15.tar.gz
buildroot-4a28e3523d600ae5eef091373cf52de80c550b15.tar.bz2
support/libtool: add patch for newer versions
Add patch to support newer (>2.4.2) versions. Adjust patch logic to check for patchlevel greater than 2 (apply new patch) or not (apply current patch). Some people/distributions used unreleased versions, with the string being 2.4.2.x, this packages are AUTORECONFed and have to be kept like this since the up-to-2.4.2 patch doesn't work, neither does the from-2.4.3 version patch. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'support')
-rw-r--r--support/libtool/buildroot-libtool-v2.4.4.patch95
1 files changed, 95 insertions, 0 deletions
diff --git a/support/libtool/buildroot-libtool-v2.4.4.patch b/support/libtool/buildroot-libtool-v2.4.4.patch
new file mode 100644
index 0000000000..bcdf30c786
--- /dev/null
+++ b/support/libtool/buildroot-libtool-v2.4.4.patch
@@ -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"