summaryrefslogtreecommitdiffstats
path: root/package/libtool/patches/100-libdir-fixes.patch
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-12-18 18:13:12 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-12-18 18:13:12 +0000
commit2e14f9c1468a0de4157c3216b9e1d2caee2b6ffc (patch)
tree5b8928a3debeddf936a87fd3f11e97a1487e977f /package/libtool/patches/100-libdir-fixes.patch
parentfcbcf81950cad9f5eecc0cb1500d3fdf1b9ff0a4 (diff)
[package] libtool: remove patches, they don't apply to libltdl
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24675 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/libtool/patches/100-libdir-fixes.patch')
-rw-r--r--package/libtool/patches/100-libdir-fixes.patch49
1 files changed, 0 insertions, 49 deletions
diff --git a/package/libtool/patches/100-libdir-fixes.patch b/package/libtool/patches/100-libdir-fixes.patch
deleted file mode 100644
index fb0254bf7..000000000
--- a/package/libtool/patches/100-libdir-fixes.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: libtool-2.4/libltdl/config/ltmain.m4sh
-===================================================================
---- libtool-2.4.orig/libltdl/config/ltmain.m4sh 2010-09-22 16:45:18.000000000 +0200
-+++ libtool-2.4/libltdl/config/ltmain.m4sh 2010-12-06 22:51:21.961732599 +0100
-@@ -5715,8 +5715,14 @@
- absdir="$abs_ladir"
- libdir="$abs_ladir"
- else
-- dir="$lt_sysroot$libdir"
-- absdir="$lt_sysroot$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="$lt_sysroot$abs_ladir"
-+ absdir="$abs_ladir"
-+ libdir="$abs_ladir"
-+ #dir="$libdir"
-+ #absdir="$lt_sysroot$libdir"
- fi
- test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
- else
-@@ -6114,8 +6120,6 @@
- add="$libdir/$linklib"
- fi
- else
-- # We cannot seem to hardcode it, guess we'll fake it.
-- add_dir="-L$libdir"
- # Try looking first in the location we're being installed to.
- if test -n "$inst_prefix_dir"; then
- case $libdir in
-@@ -6270,7 +6274,17 @@
- fi
- ;;
- *)
-- path="-L$absdir/$objdir"
-+ # OE sets installed=no in staging. We need to look in $objdir and $absdir,
-+ # preferring $objdir. RP 31/04/2008
-+ if test -f "$absdir/$objdir/$depdepl" ; then
-+ depdepl="$absdir/$objdir/$depdepl"
-+ path="-L$absdir/$objdir"
-+ elif test -f "$absdir/$depdepl" ; then
-+ depdepl="$absdir/$depdepl"
-+ path="-L$absdir"
-+ else
-+ path="-L$absdir/$objdir"
-+ fi
- ;;
- esac
- else