[oe-commits] Khem Raj : libtool-2.4: Import the RPATH fixing libtool patch from yocto

[git version control]

Module: openembedded.git
Branch: master
Commit: 9432df5a1c96f7b2e625abba0e011ad45d5aef92
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=9432df5a1c96f7b2e625abba0e011ad45d5aef92

Author: Khem Raj <raj.khem at gmail.com>
Date:   Wed Jan 19 12:41:04 2011 -0800

libtool-2.4: Import the RPATH fixing libtool patch from yocto

Signed-off-by: Khem Raj <raj.khem at gmail.com>

---

 recipes/libtool/libtool-2.4/fix-final-rpath.patch |   36 +++++++++++++++++++++
 recipes/libtool/libtool.inc                       |    3 +-
 2 files changed, 38 insertions(+), 1 deletions(-)

diff --git a/recipes/libtool/libtool-2.4/fix-final-rpath.patch b/recipes/libtool/libtool-2.4/fix-final-rpath.patch
new file mode 100644
index 0000000..402e2c6
--- /dev/null
+++ b/recipes/libtool/libtool-2.4/fix-final-rpath.patch
@@ -0,0 +1,36 @@
+Enalbing sysroot support exposed a bug where the final library
+had an RPATH encoded into it which still pointed to the sysroot.
+This works around the issue until it gets sorted out upstream.
+
+Fix suggested by Richard Purdie <richard.purdie at intel.com>
+Signed-off-by: Scott Garman <scott.a.garman at intel.com>
+
+Index: libtool-2.4/libltdl/config/ltmain.m4sh
+===================================================================
+--- libtool-2.4.orig/libltdl/config/ltmain.m4sh	2011-01-13 14:10:14.580025108 +0000
++++ libtool-2.4/libltdl/config/ltmain.m4sh	2011-01-13 15:10:18.540025113 +0000
+@@ -7246,9 +7246,11 @@
+ 	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
+ 	  for libdir in $rpath; do
+ 	    if test -n "$hardcode_libdir_flag_spec"; then
++		  func_replace_sysroot "$libdir"
++		  libdir=$func_replace_sysroot_result
++		  func_stripname '=' '' "$libdir"
++		  libdir=$func_stripname_result
+ 	      if test -n "$hardcode_libdir_separator"; then
+-		func_replace_sysroot "$libdir"
+-		libdir=$func_replace_sysroot_result
+ 		if test -z "$hardcode_libdirs"; then
+ 		  hardcode_libdirs="$libdir"
+ 		else
+@@ -7981,6 +7983,10 @@
+       hardcode_libdirs=
+       for libdir in $compile_rpath $finalize_rpath; do
+ 	if test -n "$hardcode_libdir_flag_spec"; then
++	  func_replace_sysroot "$libdir"
++	  libdir=$func_replace_sysroot_result
++	  func_stripname '=' '' "$libdir"
++	  libdir=$func_stripname_result
+ 	  if test -n "$hardcode_libdir_separator"; then
+ 	    if test -z "$hardcode_libdirs"; then
+ 	      hardcode_libdirs="$libdir"
diff --git a/recipes/libtool/libtool.inc b/recipes/libtool/libtool.inc
index 1bbb4a6..17f3534 100644
--- a/recipes/libtool/libtool.inc
+++ b/recipes/libtool/libtool.inc
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html"
 LICENSE = "GPLv2+"
 SECTION = "devel"
 
-INC_PR = "r27"
+INC_PR = "r28"
 
 FILESPATHPKG=. "libtool-${PV}:"
 
@@ -20,6 +20,7 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
 	   file://rename-with-sysroot.patch \
 	   file://resolve-sysroot.patch \
 	   file://use-sysroot-in-libpath.patch \
+	   file://fix-final-rpath.patch \
           "
 do_configure_prepend () {
 	if ${@['true', 'false'][bb.data.inherits_class('native', d) or bb.data.inherits_class('sdk', d) or (bb.data.getVar('PN', d, 1) == 'libtool-cross')]}