summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/libcap/libcap_2.74.bb12
1 files changed, 2 insertions, 10 deletions
diff --git a/meta/recipes-support/libcap/libcap_2.74.bb b/meta/recipes-support/libcap/libcap_2.74.bb
index c273853379..a1da8311b2 100644
--- a/meta/recipes-support/libcap/libcap_2.74.bb
+++ b/meta/recipes-support/libcap/libcap_2.74.bb
@@ -23,11 +23,10 @@ UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs
23inherit lib_package 23inherit lib_package
24 24
25PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" 25PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
26PACKAGECONFIG:class-native ??= ""
27
28PACKAGECONFIG[pam] = "PAM_CAP=yes,PAM_CAP=no,libpam" 26PACKAGECONFIG[pam] = "PAM_CAP=yes,PAM_CAP=no,libpam"
29 27
30EXTRA_OEMAKE = " \ 28EXTRA_OEMAKE = " \
29 ${PACKAGECONFIG_CONFARGS} \
31 INDENT= \ 30 INDENT= \
32 lib='${baselib}' \ 31 lib='${baselib}' \
33 RAISE_SETFCAP=no \ 32 RAISE_SETFCAP=no \
@@ -35,23 +34,16 @@ EXTRA_OEMAKE = " \
35 USE_GPERF=yes \ 34 USE_GPERF=yes \
36" 35"
37 36
38EXTRA_OEMAKE:append:class-target = " SYSTEM_HEADERS=${STAGING_INCDIR}"
39
40do_compile() { 37do_compile() {
41 unset CFLAGS BUILD_CFLAGS
42 oe_runmake \ 38 oe_runmake \
43 ${PACKAGECONFIG_CONFARGS} \
44 AR="${AR}" \ 39 AR="${AR}" \
45 CC="${CC}" \ 40 CC="${CC}" \
46 RANLIB="${RANLIB}" \ 41 RANLIB="${RANLIB}" \
47 OBJCOPY="${OBJCOPY}" \ 42 OBJCOPY="${OBJCOPY}"
48 COPTS="${CFLAGS}" \
49 BUILD_COPTS="${BUILD_CFLAGS}"
50} 43}
51 44
52do_install() { 45do_install() {
53 oe_runmake install \ 46 oe_runmake install \
54 ${PACKAGECONFIG_CONFARGS} \
55 DESTDIR="${D}" \ 47 DESTDIR="${D}" \
56 prefix="${prefix}" \ 48 prefix="${prefix}" \
57 SBINDIR="${sbindir}" 49 SBINDIR="${sbindir}"