package: Fix pkgdest for darwin shlibs code
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 2 Aug 2014 08:48:06 +0000 (09:48 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 3 Aug 2014 11:40:41 +0000 (12:40 +0100)
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.

(From OE-Core rev: bcada055f89c8722024faf20088943ea006cfe36)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/package.bbclass

index 26a20d1..fbdccfb 100644 (file)
@@ -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):
             #