[oe-commits] [openembedded-core] 21/30: libcap: fix -native and usrmerge builds

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 29306e10d576f68b75bcf41edf147b300a2443c0
Author: Mark Asselstine <mark.asselstine at windriver.com>
AuthorDate: Tue May 8 15:40:18 2018 -0400

    libcap: fix -native and usrmerge builds
    
    When attempting to build a -native package which DEPENDS on
    libcap-native the libcap libraries are not found and the build will
    fail (for example attempting to build qemu-native with
    'PACKAGECONFIG_append = " virtfs"').
    
    It turns out commit 2c9c4a406a0f [libcap: fix (base_)libdir usage]
    breaks builds of libcap(-native) when $root_prefix is not "". This is
    because the variables which define $root_prefix are also part of
    $prefix so you end up with part of the path being used twice, first as
    part of 'lib=' in do_compile, and secondly as part of 'prefix=' in
    do_install. When $root_prefix is "" this isn't noticed.
    
    By using $baselib we should not re-break the issue which commit
    2c9c4a406a0f was fixing but we should avoid doubling down on the
    paths thus fixing the -native and usrmerge builds.
    
    Signed-off-by: Mark Asselstine <mark.asselstine at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-support/libcap/libcap_2.25.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-support/libcap/libcap_2.25.bb b/meta/recipes-support/libcap/libcap_2.25.bb
index 47ecf34..6df6745 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='${base_libdir}' \
+  lib='${baselib}' \
   RAISE_SETFCAP=no \
   DYNAMIC=yes \
   BUILD_GPERF=yes \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.