1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 00:39:46 +00:00

libcap: clean up configuration variables

There's no need to set PACKAGECONFIG:class-native as we disable PAM in
the native DISTRO_FEATURES.

No need to set COPTS, since "Canonicalize build system"[1] the exported
CFLAGS/CPPFLAGS/LDFLAGS are respected.

Merge multiple make arguments into EXTRA_OEMAKE to remove duplication.

SYSTEM_HEADERS is not used upstream, remove.

[1] 2762c2c1a8c98d9012fcd40f20d133493a0b3219

(From OE-Core rev: 88cd79eee6dcc40d0e75ab35d9092ac3c788be7d)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2025-03-17 17:08:45 +00:00
committed by Richard Purdie
parent 8536e51f0f
commit 45ecfbb583
+2 -10
View File
@@ -23,11 +23,10 @@ UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs
inherit lib_package inherit lib_package
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
PACKAGECONFIG:class-native ??= ""
PACKAGECONFIG[pam] = "PAM_CAP=yes,PAM_CAP=no,libpam" PACKAGECONFIG[pam] = "PAM_CAP=yes,PAM_CAP=no,libpam"
EXTRA_OEMAKE = " \ EXTRA_OEMAKE = " \
${PACKAGECONFIG_CONFARGS} \
INDENT= \ INDENT= \
lib='${baselib}' \ lib='${baselib}' \
RAISE_SETFCAP=no \ RAISE_SETFCAP=no \
@@ -35,23 +34,16 @@ EXTRA_OEMAKE = " \
USE_GPERF=yes \ USE_GPERF=yes \
" "
EXTRA_OEMAKE:append:class-target = " SYSTEM_HEADERS=${STAGING_INCDIR}"
do_compile() { do_compile() {
unset CFLAGS BUILD_CFLAGS
oe_runmake \ oe_runmake \
${PACKAGECONFIG_CONFARGS} \
AR="${AR}" \ AR="${AR}" \
CC="${CC}" \ CC="${CC}" \
RANLIB="${RANLIB}" \ RANLIB="${RANLIB}" \
OBJCOPY="${OBJCOPY}" \ OBJCOPY="${OBJCOPY}"
COPTS="${CFLAGS}" \
BUILD_COPTS="${BUILD_CFLAGS}"
} }
do_install() { do_install() {
oe_runmake install \ oe_runmake install \
${PACKAGECONFIG_CONFARGS} \
DESTDIR="${D}" \ DESTDIR="${D}" \
prefix="${prefix}" \ prefix="${prefix}" \
SBINDIR="${sbindir}" SBINDIR="${sbindir}"