From f142648c46c6830cbe4df251da939ac80c7078c2 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 7 Jul 2010 20:14:35 -0700 Subject: 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 --- classes/relocatable.bbclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/classes/relocatable.bbclass b/classes/relocatable.bbclass index cc220276fb..2af3a7a1c4 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): -- cgit v1.2.3