summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorAndrei Gherzan <andrei.gherzan@windriver.com>2012-12-14 04:15:03 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-14 08:53:41 +0000
commit0231336247210b7cc8a556042a8b06094376e1a5 (patch)
tree1778b341bc67484f0c646c874a5b8939d156be1e /meta/classes
parent14f4cfcc3478f0ad236c1994f5094161ac358492 (diff)
downloadpoky-0231336247210b7cc8a556042a8b06094376e1a5.tar.gz
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. (From OE-Core rev: 46dc514ff5a3d2693546cf95c5481e0539c43580) Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/chrpath.bbclass2
1 files changed, 1 insertions, 1 deletions
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):
49 new_rpaths = [] 49 new_rpaths = []
50 for rpath in rpaths: 50 for rpath in rpaths:
51 # If rpath is already dynamic copy it to new_rpath and continue 51 # If rpath is already dynamic copy it to new_rpath and continue
52 rpath = os.path.normpath(rpath)
53 if rpath.find("$ORIGIN") != -1: 52 if rpath.find("$ORIGIN") != -1:
54 new_rpaths.append(rpath.strip()) 53 new_rpaths.append(rpath.strip())
55 continue 54 continue
55 rpath = os.path.normpath(rpath)
56 # If the rpath shares a root with base_prefix determine a new dynamic rpath from the 56 # If the rpath shares a root with base_prefix determine a new dynamic rpath from the
57 # base_prefix shared root 57 # base_prefix shared root
58 if rpath.find(basedir) != -1: 58 if rpath.find(basedir) != -1: