summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2012-09-04 16:19:51 -0700
committerScott Garman <scott.a.garman@intel.com>2012-09-24 09:51:11 -0700
commit9ebb327ae17d1a765fd1499546ccf9076bb93234 (patch)
tree98d2feb7cc94ce705c7be0c3245ce3502ace4e4f
parent21952b62e3fca6c9fe750db62ca2b0587912be8a (diff)
downloadopenembedded-core-9ebb327ae17d1a765fd1499546ccf9076bb93234.tar.gz
openembedded-core-9ebb327ae17d1a765fd1499546ccf9076bb93234.tar.bz2
openembedded-core-9ebb327ae17d1a765fd1499546ccf9076bb93234.zip
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@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-rw-r--r--meta/classes/relocatable.bbclass3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/relocatable.bbclass b/meta/classes/relocatable.bbclass
index 072f533f4f..7bbfe32d9f 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