From patchwork Tue Aug 14 12:13:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED, REQUEST, 55/64] chrpath.bbclass: Account for case when ORIGIN is in RPATH Date: Tue, 14 Aug 2012 12:13:42 -0000 From: Saul Wold X-Patchwork-Id: 34561 Message-Id: <5824e7f06b2263fc89efa12f2aeee13f6cf76c54.1344946189.git.sgw@linux.intel.com> To: openembedded-core@lists.openembedded.org From: Khem Raj 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 Signed-off-by: Saul Wold --- meta/classes/chrpath.bbclass | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/meta/classes/chrpath.bbclass b/meta/classes/chrpath.bbclass index 10b5ca0..e903b65 100644 --- a/meta/classes/chrpath.bbclass +++ b/meta/classes/chrpath.bbclass @@ -49,6 +49,7 @@ def process_dir (directory, d): new_rpaths = [] for rpath in rpaths: # If rpath is already dynamic continue + new_rpaths.append("%s" % (rpath.strip())) if rpath.find("$ORIGIN") != -1: continue # If the rpath shares a root with base_prefix determine a new dynamic rpath from the