Patchwork package: Fix pkgdest for darwin shlibs code

login
register
mail settings
Submitter Richard Purdie
Date Aug. 2, 2014, 8:48 a.m.
Message ID <1406969286.6981.15.camel@ted>
Download mbox | patch
Permalink /patch/77143/
State Accepted
Commit c70203998b30329dd20dd8b146cebe08130cf57f
Headers show

Comments

Richard Purdie - Aug. 2, 2014, 8:48 a.m.
When the code was rewritten we forgot to strip the pkg that is present
in the pkgdest path. This was fixed in the linux version of the code
but not the darwin one, this matches the fix.

Without this, the provider paths are broken.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Patch

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 26a20d1..fbdccfb 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1434,7 +1434,7 @@  python package_do_shlibs() {
     def darwin_so(file, needed, sonames, renames, pkgver):
         if not os.path.exists(file):
             return
-        ldir = os.path.dirname(file).replace(pkgdest, '')
+        ldir = os.path.dirname(file).replace(pkgdest + "/" + pkg, '')
 
         def get_combinations(base):
             #