From 01e07585adea462539b95873ac16b27879f13196 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Wed, 31 Dec 2008 22:14:16 +0000
Subject: libtool: Drop old version 1.5.10

---
 .../libtool/libtool-1.5.10/libdir-la2.patch        | 64 ----------------------
 1 file changed, 64 deletions(-)
 delete mode 100644 meta/packages/libtool/libtool-1.5.10/libdir-la2.patch

(limited to 'meta/packages/libtool/libtool-1.5.10/libdir-la2.patch')

diff --git a/meta/packages/libtool/libtool-1.5.10/libdir-la2.patch b/meta/packages/libtool/libtool-1.5.10/libdir-la2.patch
deleted file mode 100644
index 0d5d261203..0000000000
--- a/meta/packages/libtool/libtool-1.5.10/libdir-la2.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-OE changes to installed=no which means we can't run the original test
-and just look in $objdir. We therefore look in both, preferring 
-$objdir if it exists - RP 29/11/2007
-
---- libtool-1.5.10/ltmain.in.orig
-+++ libtool-1.5.10/ltmain.in
-@@ -3105,8 +3105,11 @@
- 		  fi
- 		  ;;
- 		esac
--		if grep "^installed=no" $deplib > /dev/null; then
--		  path="$absdir/$objdir"
-+#		OE changes to installed=no which means we can't run the original test
-+#		and just look in $objdir. We therefore look in both, preferring 
-+#		$objdir if it exists, see below. - RP 29/11/2007
-+#		if grep "^installed=no" $deplib > /dev/null; then
-+#		  path="$absdir/$objdir"
- #		This interferes with crosscompilation. -CL
- #		else
- #		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-@@ -3117,7 +3120,7 @@
- #		  if test "$absdir" != "$libdir"; then
- #		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
- #		  fi
--		else
-+		if ! grep "^installed=no" $deplib > /dev/null; then
- 		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- 		  if test -z "$libdir"; then
- 		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-@@ -3138,9 +3141,17 @@
- 		    for tmp in $deplibrary_names ; do
- 		      depdepl=$tmp
- 		    done
--		    if test -f "$path/$depdepl" ; then
--		      depdepl="$path/$depdepl"
-+
-+		    if test -f "$absdir/$objdir/$depdepl" ; then
-+		      depdepl="$absdir/$objdir/$depdepl"
-+		      path="$absdir/$objdir"
-+		    elif test -f "$absdir/$depdepl" ; then
-+		      depdepl="$absdir/$depdepl"
-+		      path="$absdir"
-+		    else
-+		      path="$absdir/$objdir"
- 		    fi
-+		    
- 		    # do not add paths which are already there
- 		    case " $newlib_search_path " in
- 		    *" $path "*) ;;
-@@ -3150,7 +3161,13 @@
- 		  path=""
- 		  ;;
- 		*)
--		  path="-L$path"
-+		  if test -d "$absdir/$objdir" ; then
-+		    path="-L$absdir/$objdir"
-+		  elif test -d "$absdir" ; then
-+		    path="-L$absdir"
-+		  else
-+		    path="-L$absdir/$objdir"
-+		  fi
- 		  ;;
- 		esac
- 		;;
-- 
cgit v1.2.3-54-g00ecf