diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2011-11-29 11:30:40 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-01 20:40:23 +0000 |
commit | d8bee043cbd5c88a0ddca58868f8e4556ef8531c (patch) | |
tree | c87a785209b157adb90a735f85e27a9c85ecd17a /meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch | |
parent | 177b2e337a37a67fe3a8a40d3f0704b30117f9e2 (diff) | |
download | poky-d8bee043cbd5c88a0ddca58868f8e4556ef8531c.tar.gz |
libtool: Upgrade from 2.4 -> 2.4.2
Rebased patches to the newer source code and deleted resolve-sysroot.patch
since its already applied upstream
merged libtool-2.4.2.inc & libtool.inc files
replaced PR with ${INC_PR}.0
(From OE-Core rev: aa0cb889a4ef883235dc3f3e1d76ee4a556ae03a)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch')
-rw-r--r-- | meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch b/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch index 4c36e4ecb4..5c275ffd32 100644 --- a/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch +++ b/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch | |||
@@ -7,11 +7,11 @@ This works around the issue until it gets sorted out upstream. | |||
7 | Fix suggested by Richard Purdie <richard.purdie@intel.com> | 7 | Fix suggested by Richard Purdie <richard.purdie@intel.com> |
8 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | 8 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> |
9 | 9 | ||
10 | Index: libtool-2.4/libltdl/config/ltmain.m4sh | 10 | Index: libtool-2.4.2/libltdl/config/ltmain.m4sh |
11 | =================================================================== | 11 | =================================================================== |
12 | --- libtool-2.4.orig/libltdl/config/ltmain.m4sh 2011-01-13 14:10:14.580025108 +0000 | 12 | --- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh |
13 | +++ libtool-2.4/libltdl/config/ltmain.m4sh 2011-01-13 15:10:18.540025113 +0000 | 13 | +++ libtool-2.4.2/libltdl/config/ltmain.m4sh |
14 | @@ -7246,9 +7246,11 @@ | 14 | @@ -7268,9 +7268,11 @@ EOF |
15 | test "$opt_mode" != relink && rpath="$compile_rpath$rpath" | 15 | test "$opt_mode" != relink && rpath="$compile_rpath$rpath" |
16 | for libdir in $rpath; do | 16 | for libdir in $rpath; do |
17 | if test -n "$hardcode_libdir_flag_spec"; then | 17 | if test -n "$hardcode_libdir_flag_spec"; then |
@@ -25,7 +25,7 @@ Index: libtool-2.4/libltdl/config/ltmain.m4sh | |||
25 | if test -z "$hardcode_libdirs"; then | 25 | if test -z "$hardcode_libdirs"; then |
26 | hardcode_libdirs="$libdir" | 26 | hardcode_libdirs="$libdir" |
27 | else | 27 | else |
28 | @@ -7981,6 +7983,10 @@ | 28 | @@ -7999,6 +8001,10 @@ EOF |
29 | hardcode_libdirs= | 29 | hardcode_libdirs= |
30 | for libdir in $compile_rpath $finalize_rpath; do | 30 | for libdir in $compile_rpath $finalize_rpath; do |
31 | if test -n "$hardcode_libdir_flag_spec"; then | 31 | if test -n "$hardcode_libdir_flag_spec"; then |