summaryrefslogtreecommitdiffstats
path: root/support/libtool/buildroot-libtool-v2.4.patch
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2011-08-31 23:35:03 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2011-09-17 08:14:56 +0200
commit20f8a7dec6fc25f6c475163c0273147580128867 (patch)
tree6a768a78c387393d70e6865041b87f79d74e8ddf /support/libtool/buildroot-libtool-v2.4.patch
parentf082c7c5cf72296566dcf92bba4fcb4c95f2186f (diff)
downloadbuildroot-novena-20f8a7dec6fc25f6c475163c0273147580128867.tar.gz
buildroot-novena-20f8a7dec6fc25f6c475163c0273147580128867.zip
support: move libtool patches in support/libtool
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'support/libtool/buildroot-libtool-v2.4.patch')
-rw-r--r--support/libtool/buildroot-libtool-v2.4.patch47
1 files changed, 47 insertions, 0 deletions
diff --git a/support/libtool/buildroot-libtool-v2.4.patch b/support/libtool/buildroot-libtool-v2.4.patch
new file mode 100644
index 000000000..d82d61062
--- /dev/null
+++ b/support/libtool/buildroot-libtool-v2.4.patch
@@ -0,0 +1,47 @@
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -1416,8 +1416,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
+@@ -2962,8 +2962,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.
+@@ -6683,7 +6686,7 @@
+ *)
+ if test "$installed" = no; then
+ func_append notinst_deplibs " $lib"
+- need_relink=yes
++ need_relink=no
+ fi
+ ;;
+ esac
+@@ -9257,6 +9260,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"