diff options
| author | Andrei Gherzan <andrei.gherzan@windriver.com> | 2012-12-14 04:15:03 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-14 08:50:06 +0000 |
| commit | 46dc514ff5a3d2693546cf95c5481e0539c43580 (patch) | |
| tree | 8ed0f460d940f6cc2e86585c971eb1e82071ce78 /meta/classes/chrpath.bbclass | |
| parent | 7d7f199806bee016553d1046a53bd55ab3a9e609 (diff) | |
| download | openembedded-core-46dc514ff5a3d2693546cf95c5481e0539c43580.tar.gz openembedded-core-46dc514ff5a3d2693546cf95c5481e0539c43580.tar.bz2 openembedded-core-46dc514ff5a3d2693546cf95c5481e0539c43580.zip | |
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 <andrei.gherzan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/chrpath.bbclass')
| -rw-r--r-- | meta/classes/chrpath.bbclass | 2 |
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): 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: |