From: Ross Burton <ross.burton@arm.com>
Date: Mon, 17 Mar 2025 17:08:45 +0000 (+0000)
Subject: libcap: clean up configuration variables
X-Git-Tag: 2025-04-walnascar~163
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88cd79eee6dcc40d0e75ab35d9092ac3c788be7d;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

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

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-support/libcap/libcap_2.74.bb b/meta/recipes-support/libcap/libcap_2.74.bb
index c2738533799..a1da8311b27 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
 inherit lib_package
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
-PACKAGECONFIG:class-native ??= ""
-
 PACKAGECONFIG[pam] = "PAM_CAP=yes,PAM_CAP=no,libpam"
 
 EXTRA_OEMAKE = " \
+  ${PACKAGECONFIG_CONFARGS} \
   INDENT=  \
   lib='${baselib}' \
   RAISE_SETFCAP=no \
@@ -35,23 +34,16 @@ EXTRA_OEMAKE = " \
   USE_GPERF=yes \
 "
 
-EXTRA_OEMAKE:append:class-target = " SYSTEM_HEADERS=${STAGING_INCDIR}"
-
 do_compile() {
-	unset CFLAGS BUILD_CFLAGS
 	oe_runmake \
-		${PACKAGECONFIG_CONFARGS} \
 		AR="${AR}" \
 		CC="${CC}" \
 		RANLIB="${RANLIB}" \
-                OBJCOPY="${OBJCOPY}" \
-		COPTS="${CFLAGS}" \
-		BUILD_COPTS="${BUILD_CFLAGS}"
+		OBJCOPY="${OBJCOPY}"
 }
 
 do_install() {
 	oe_runmake install \
-		${PACKAGECONFIG_CONFARGS} \
 		DESTDIR="${D}" \
 		prefix="${prefix}" \
 		SBINDIR="${sbindir}"