[oe-commits] Tom Rini : relocatible.bbclass: Call oe.path.relative in try/except

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: f142648c46c6830cbe4df251da939ac80c7078c2
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=f142648c46c6830cbe4df251da939ac80c7078c2

Author: Tom Rini <tom_rini at mentor.com>
Date:   Wed Jul  7 20:14:35 2010 -0700

relocatible.bbclass: Call oe.path.relative in try/except

Some programs such as libxml-parser-perl-native can have junky
RPATH directories.  Found by Khem Raj.

Signed-off-by: Tom Rini <tom_rini at mentor.com>

---

 classes/relocatable.bbclass |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/classes/relocatable.bbclass b/classes/relocatable.bbclass
index cc22027..2af3a7a 100644
--- a/classes/relocatable.bbclass
+++ b/classes/relocatable.bbclass
@@ -65,7 +65,11 @@ def process_dir (directory, d):
                     fdir = os.path.dirname(fpath.rpartition(tmpdir)[2])
                     ldir = rpath.partition(tmpdir)[2].strip()
 
-                new_rpaths.append("$ORIGIN/%s" % oe.path.relative(fdir, ldir))
+                try:
+                    new_rpaths.append("$ORIGIN/%s" % oe.path.relative(fdir, ldir))
+                except ValueError:
+                    # Some programs link in non-existant RPATH directories.
+                    continue
 
             # if we have modified some rpaths call chrpath to update the binary
             if len(new_rpaths):