summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-02 09:48:06 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-03 12:40:41 +0100
commitc70203998b30329dd20dd8b146cebe08130cf57f (patch)
tree322db27ea6e0fb22d76ab8dafb93000c352280e6
parent55379f29a6db83f035eb96ed94d217b7a108e00f (diff)
downloadpoky-c70203998b30329dd20dd8b146cebe08130cf57f.tar.gz
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. (From OE-Core rev: bcada055f89c8722024faf20088943ea006cfe36) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 26a20d1ff5..fbdccfbe6d 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1434,7 +1434,7 @@ python package_do_shlibs() {
1434 def darwin_so(file, needed, sonames, renames, pkgver): 1434 def darwin_so(file, needed, sonames, renames, pkgver):
1435 if not os.path.exists(file): 1435 if not os.path.exists(file):
1436 return 1436 return
1437 ldir = os.path.dirname(file).replace(pkgdest, '') 1437 ldir = os.path.dirname(file).replace(pkgdest + "/" + pkg, '')
1438 1438
1439 def get_combinations(base): 1439 def get_combinations(base):
1440 # 1440 #