diff options
| author |   Tom Rini <tom_rini@mentor.com> | 2010-07-07 20:14:35 -0700 |
|---|---|---|
| committer | Tom Rini <tom_rini@mentor.com> | 2010-07-07 20:14:35 -0700 |
| commit | f142648c46c6830cbe4df251da939ac80c7078c2 (patch) | |
| tree | 09d4a3dbc45203ee754a616a5c45cab7fc6b90ab | |
| parent | af6fac4f74b3b2b6c11e73870f84e3af7562d385 (diff) | |
| download | openembedded-f142648c46c6830cbe4df251da939ac80c7078c2.tar.gz | |
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@mentor.com>
| -rw-r--r-- | classes/relocatable.bbclass | 6 |
1 files changed, 5 insertions, 1 deletions
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): |