From 46dc514ff5a3d2693546cf95c5481e0539c43580 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Fri, 14 Dec 2012 04:15:03 +0200 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/chrpath.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/classes/chrpath.bbclass') diff --git a/meta/classes/chrpath.bbclass b/meta/classes/chrpath.bbclass index 82329d1de3..0c7ab77a81 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: -- cgit v1.2.3