From b46c55c3b9db5d8f2080ae2611294a5b24efe4a4 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Tue, 8 May 2018 15:40:18 -0400 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-support/libcap/libcap_2.25.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/recipes-support/libcap') diff --git a/meta/recipes-support/libcap/libcap_2.25.bb b/meta/recipes-support/libcap/libcap_2.25.bb index 47ecf34549..6df674547c 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 \ -- cgit 1.2.3-korg