[oe-commits] Scott Garman : relocatable.bbclass: Account for case when ORIGIN is in RPATH

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: denzil
Commit: 9ebb327ae17d1a765fd1499546ccf9076bb93234
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=9ebb327ae17d1a765fd1499546ccf9076bb93234

Author: Scott Garman <scott.a.garman at intel.com>
Date:   Tue Sep  4 16:19:51 2012 -0700

relocatable.bbclass: Account for case when ORIGIN is in RPATH

This patch was backported from OE-Core rev:
43600df0d4efc976a9451163dd334b4763937932

This fixes a case when RPATH embedded in program have one of
its path already relative to ORIGIN. We were losing that path
if such a path existed. This patch appends it to the new edited
rpath being created when we see it.

so RPATH like below

(RPATH) Library rpath:
[$ORIGIN/../lib/amd64/jli:$ORIGIN/../jre/lib/amd64/jli]

would end up being empty

but after this patch its kept intact

Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
Signed-off-by: Scott Garman <scott.a.garman at intel.com>

---

 meta/classes/relocatable.bbclass |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/meta/classes/relocatable.bbclass b/meta/classes/relocatable.bbclass
index 072f533..7bbfe32 100644
--- a/meta/classes/relocatable.bbclass
+++ b/meta/classes/relocatable.bbclass
@@ -50,8 +50,9 @@ def process_dir (directory, d):
             rpaths = curr_rpath.split(":")
             new_rpaths = []
             for rpath in rpaths:
-                # If rpath is already dynamic continue
+                # If rpath is already dynamic copy it to new_rpath and continue
                 if rpath.find("$ORIGIN") != -1:
+                    new_rpaths.append(rpath.strip())
                     continue
                 # If the rpath shares a root with base_prefix determine a new dynamic rpath from the
                 # base_prefix shared root