[oe-commits] Andrei Gherzan : chrpath.bbclass: Normalize rpath only of it doesn' t contain ORIGIN variable

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 46dc514ff5a3d2693546cf95c5481e0539c43580
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=46dc514ff5a3d2693546cf95c5481e0539c43580

Author: Andrei Gherzan <andrei.gherzan at windriver.com>
Date:   Fri Dec 14 04:15:03 2012 +0200

chrpath.bbclass: Normalize rpath only of it doesn't contain ORIGIN variable

If we normalize a rpath which contains ORIGIN variable, the binary will end
up without those rpaths at all. So check first if rpath contains ORIGIN variable
and if not, move on and normalize it.

Signed-off-by: Andrei Gherzan <andrei.gherzan at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

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

diff --git a/meta/classes/chrpath.bbclass b/meta/classes/chrpath.bbclass
index 82329d1..0c7ab77 100644
--- a/meta/classes/chrpath.bbclass
+++ b/meta/classes/chrpath.bbclass
@@ -49,10 +49,10 @@ def process_dir (directory, d):
             new_rpaths = []
             for rpath in rpaths:
                 # If rpath is already dynamic copy it to new_rpath and continue
-                rpath =  os.path.normpath(rpath)
                 if rpath.find("$ORIGIN") != -1:
                     new_rpaths.append(rpath.strip())
                     continue
+                rpath =  os.path.normpath(rpath)
                 # If the rpath shares a root with base_prefix determine a new dynamic rpath from the
                 # base_prefix shared root
                 if rpath.find(basedir) != -1: