summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-01-06 14:47:37 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-23 11:36:26 +0000
commitd4e1862453b2a4c12400de0f43f08a9871a4de60 (patch)
treea79c7e99aec47a61d3d37074e5a335e6d7bd2fd8 /meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch
parentd97787346347526d163d0de69222bff2e7b25408 (diff)
downloadpoky-d4e1862453b2a4c12400de0f43f08a9871a4de60.tar.gz
libtool: upgraded to 2.4.4
* Upgrade: - libtool-native - libtool-cross - nativesdk-libtool - libtool * Remove 2 patches: - respect-fstack-protector.patch: already in the new source. - avoid_absolute_paths_for_general_utils.patch: no general.m4sh any more. - Use inline-source to install libtoolize. * Update other patches * The LIC_FILES_CHKSUM is changed because of the indent, the contents are the same. * The libtool config files are put in libtool/build-aux now, it was libtool/config in the past. (From OE-Core rev: 871dc461b1dfc431c0c95743af1624b781262bce) Signed-off-by: Robert Yang <liezhi.yang@windriver.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.patch22
1 files changed, 11 insertions, 11 deletions
diff --git a/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch b/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch
index 6f9d321eb3..5c9f8cc9c0 100644
--- a/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch
+++ b/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch
@@ -7,13 +7,13 @@ This works around the issue until it gets sorted out upstream.
7Fix suggested by Richard Purdie <richard.purdie@intel.com> 7Fix suggested by Richard Purdie <richard.purdie@intel.com>
8Signed-off-by: Scott Garman <scott.a.garman@intel.com> 8Signed-off-by: Scott Garman <scott.a.garman@intel.com>
9Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com> 9Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com>
10Updated by: Robert Yang <liezhi.yang@windriver.com>
10 11
11Index: libtool-2.4.2/libltdl/config/ltmain.m4sh 12diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
12=================================================================== 13--- a/build-aux/ltmain.in
13--- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh 14+++ b/build-aux/ltmain.in
14+++ libtool-2.4.2/libltdl/config/ltmain.m4sh 15@@ -7569,9 +7569,11 @@ EOF
15@@ -7268,9 +7268,11 @@ 16 test relink = "$opt_mode" || rpath=$compile_rpath$rpath
16 test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
17 for libdir in $rpath; do 17 for libdir in $rpath; do
18 if test -n "$hardcode_libdir_flag_spec"; then 18 if test -n "$hardcode_libdir_flag_spec"; then
19+ func_replace_sysroot "$libdir" 19+ func_replace_sysroot "$libdir"
@@ -24,9 +24,9 @@ Index: libtool-2.4.2/libltdl/config/ltmain.m4sh
24- func_replace_sysroot "$libdir" 24- func_replace_sysroot "$libdir"
25- libdir=$func_replace_sysroot_result 25- libdir=$func_replace_sysroot_result
26 if test -z "$hardcode_libdirs"; then 26 if test -z "$hardcode_libdirs"; then
27 hardcode_libdirs="$libdir" 27 hardcode_libdirs=$libdir
28 else 28 else
29@@ -7999,6 +8001,10 @@ 29@@ -8301,6 +8303,10 @@ EOF
30 hardcode_libdirs= 30 hardcode_libdirs=
31 for libdir in $compile_rpath $finalize_rpath; do 31 for libdir in $compile_rpath $finalize_rpath; do
32 if test -n "$hardcode_libdir_flag_spec"; then 32 if test -n "$hardcode_libdir_flag_spec"; then
@@ -36,8 +36,8 @@ Index: libtool-2.4.2/libltdl/config/ltmain.m4sh
36+ libdir=$func_stripname_result 36+ libdir=$func_stripname_result
37 if test -n "$hardcode_libdir_separator"; then 37 if test -n "$hardcode_libdir_separator"; then
38 if test -z "$hardcode_libdirs"; then 38 if test -z "$hardcode_libdirs"; then
39 hardcode_libdirs="$libdir" 39 hardcode_libdirs=$libdir
40@@ -8050,6 +8056,10 @@ 40@@ -8352,6 +8358,10 @@ EOF
41 hardcode_libdirs= 41 hardcode_libdirs=
42 for libdir in $finalize_rpath; do 42 for libdir in $finalize_rpath; do
43 if test -n "$hardcode_libdir_flag_spec"; then 43 if test -n "$hardcode_libdir_flag_spec"; then
@@ -47,4 +47,4 @@ Index: libtool-2.4.2/libltdl/config/ltmain.m4sh
47+ libdir=$func_stripname_result 47+ libdir=$func_stripname_result
48 if test -n "$hardcode_libdir_separator"; then 48 if test -n "$hardcode_libdir_separator"; then
49 if test -z "$hardcode_libdirs"; then 49 if test -z "$hardcode_libdirs"; then
50 hardcode_libdirs="$libdir" 50 hardcode_libdirs=$libdir