diff options
| author |   Sven 'sleipnir' Rebhan <odinshorse@googlemail.com> | 2009-03-14 14:28:35 +0000 |
|---|---|---|
| committer | Sven 'sleipnir' Rebhan <odinshorse@googlemail.com> | 2009-03-14 14:28:35 +0000 |
| commit | 6708e7c57871bf583e01767278884f90a2f6aaee (patch) | |
| tree | 03b1f34cf63f02694b4bcdb11312331aaf0e35e5 /sys-devel | |
| parent | A fix for the gcc issue is in the overlay and the ncurses include dir seems t... (diff) | |
| download | embedded-cross-6708e7c57871bf583e01767278884f90a2f6aaee.tar.gz embedded-cross-6708e7c57871bf583e01767278884f90a2f6aaee.tar.bz2 embedded-cross-6708e7c57871bf583e01767278884f90a2f6aaee.zip | |
Improved libtool fix.
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/libtool/Manifest | 2 | ||||
| -rw-r--r-- | sys-devel/libtool/files/2.2.6a/libtool-2.2.6a-add-cross-compile-root-to-libdir.patch | 25 |
2 files changed, 20 insertions, 7 deletions
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest index 6b9e958..faa7746 100644 --- a/sys-devel/libtool/Manifest +++ b/sys-devel/libtool/Manifest @@ -1,5 +1,5 @@ AUX 1.5.20/libtool-1.5.20-use-linux-version-in-fbsd.patch 1185 RMD160 ed02facdc5fd1ea9ffd403f5641f620791d833db SHA1 8d5784695682e3e8a271a9ed635d9d1566c4e99b SHA256 6a17e149e3638c3c94679459e1201f5dd7abbe97e5c8ab3654c1a0d079f53326 -AUX 2.2.6a/libtool-2.2.6a-add-cross-compile-root-to-libdir.patch 765 RMD160 960a5570f0336d6cb3c64764206b4392f6aeab44 SHA1 1d230d4a0d98819c01a4a58ab29dd84d219e28f0 SHA256 f41df31d854878c142ecef7afb9d20e15b2401c3c1081938d0611e036596cde4 +AUX 2.2.6a/libtool-2.2.6a-add-cross-compile-root-to-libdir.patch 1094 RMD160 580846fcc5848d6d8c849befafa75da97c3fde11 SHA1 64fc17143719426dcb7fba502acdf88a2d4f2d15 SHA256 cc69848e4c20d511ad58e643b509e3e672323421ff469921dc23860e9cfa6e91 AUX 2.2.6a/libtool-2.2.6a-gnuinfo.patch 1454 RMD160 1342700e864e985559dd55f9d49a7d81c9d2a5ee SHA1 9c5410b857551ec202159dd570ca8a81f40d507e SHA256 a06eee9bbbbb617c6b8014bb67ba1442b0b0a618079998d1f629a6043c97083a DIST libtool-2.2.6a.tar.lzma 733923 RMD160 1f1d4d8a86615fb455b76d5edcc92fe1a8ebfa2b SHA1 7c5fdce11777261a6c407fe97ac8a1ae5fe99d2b SHA256 1d22960afeab230c9c380365ea8791b194109a5f9d5916a1e29c3d0bdaa9638a EBUILD libtool-2.2.6a.ebuild 1701 RMD160 ef1d9fee27d251107ff7b1680d8454741130c4ed SHA1 b704ee3b1f258efb26a77ded8a07868d6ae837d1 SHA256 fb8217d0677a2e7734b3b27abaf7f14fc40f7573132359ed5561f193da9fb03a diff --git a/sys-devel/libtool/files/2.2.6a/libtool-2.2.6a-add-cross-compile-root-to-libdir.patch b/sys-devel/libtool/files/2.2.6a/libtool-2.2.6a-add-cross-compile-root-to-libdir.patch index 3c7d99b..cd0924e 100644 --- a/sys-devel/libtool/files/2.2.6a/libtool-2.2.6a-add-cross-compile-root-to-libdir.patch +++ b/sys-devel/libtool/files/2.2.6a/libtool-2.2.6a-add-cross-compile-root-to-libdir.patch @@ -1,20 +1,33 @@ ---- libltdl/config/ltmain.sh 2008-09-07 19:56:33.000000000 +0200 -+++ libltdl/config/ltmain.sh.new 2009-02-15 20:37:47.000000000 +0100 -@@ -5768,7 +5768,7 @@ +--- libltdl/config/ltmain.sh 2009-03-14 14:00:47.000000000 +0000 ++++ libltdl/config/ltmain.sh.new 2009-03-14 14:03:09.000000000 +0000 +@@ -5768,7 +5768,12 @@ test "$hardcode_direct_absolute" = no; then add="$libdir/$linklib" elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" -+ add_dir="-L$ROOT/$libdir" ++ # Try looking first in the location we're being installed to. ++ if test -n "$inst_prefix_dir"; then ++ add_dir="-L$inst_prefix_dir$libdir" ++ else ++ add_dir="-L$libdir" ++ fi add="-l$name" elif test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in -@@ -5785,7 +5785,7 @@ +@@ -5785,7 +5790,6 @@ fi else # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" -+ add_dir="-L$ROOT/$libdir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in +@@ -5793,6 +5797,8 @@ + add_dir="$add_dir -L$inst_prefix_dir$libdir" + ;; + esac ++ else ++ add_dir="-L$libdir" + fi + add="-l$name" + fi |