From: Koen Kooi <koen@dominion.thruhere.net>
Date: Mon, 16 Apr 2018 13:00:19 +0000 (+0200)
Subject: libcap: fix (base_)libdir usage
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=54e6321e173d3007afddbe9f20eab954d50fec55;p=openembedded-core.git

libcap: fix (base_)libdir usage

The recipe wants to install libs into base_libdir, but uses "basename $libdir" to derive that. That breaks in a multiarch setup. Use the proper variable and remove the inline python usage.

Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/meta/recipes-support/libcap/libcap_2.25.bb b/meta/recipes-support/libcap/libcap_2.25.bb
index d619a2eb4c..47ecf34549 100644
--- a/meta/recipes-support/libcap/libcap_2.25.bb
+++ b/meta/recipes-support/libcap/libcap_2.25.bb
@@ -32,7 +32,7 @@ PACKAGECONFIG[pam] = "PAM_CAP=yes,PAM_CAP=no,libpam"
 
 EXTRA_OEMAKE = " \
   INDENT=  \
-  lib=${@os.path.basename('${libdir}')} \
+  lib='${base_libdir}' \
   RAISE_SETFCAP=no \
   DYNAMIC=yes \
   BUILD_GPERF=yes \