[oe-commits] Richard Purdie : package: Fix pkgdest for darwin shlibs code

git at git.openembedded.org git at git.openembedded.org
Sun Aug 3 11:41:02 UTC 2014


Module: openembedded-core.git
Branch: master
Commit: bcada055f89c8722024faf20088943ea006cfe36
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=bcada055f89c8722024faf20088943ea006cfe36

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Sat Aug  2 09:48:06 2014 +0100

package: Fix pkgdest for darwin shlibs code

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 at linuxfoundation.org>

---

 meta/classes/package.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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):
             #



More information about the Openembedded-commits mailing list