From 20f8a7dec6fc25f6c475163c0273147580128867 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 31 Aug 2011 23:35:03 +0200 Subject: support: move libtool patches in support/libtool Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/buildroot-libtool-v2.4.patch | 47 ------------------------------------ 1 file changed, 47 deletions(-) delete mode 100644 package/buildroot-libtool-v2.4.patch (limited to 'package/buildroot-libtool-v2.4.patch') diff --git a/package/buildroot-libtool-v2.4.patch b/package/buildroot-libtool-v2.4.patch deleted file mode 100644 index d82d61062..000000000 --- a/package/buildroot-libtool-v2.4.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- 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" -- cgit v1.2.3