From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 22 Oct 2025 05:08:06 +0000 (-0700)
Subject: libcap: Pass OE defined BUILD_CC and BUILD_LDFLAGS
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c82e49d1707f2057baa3f7fbaeea0b785712a11f;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

libcap: Pass OE defined BUILD_CC and BUILD_LDFLAGS

This ensures that, native pieces in target builds
are build with correct flags to be able to run on build host

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
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/files/0001-libcap-Add-build-ldflags-to-_makenames-rule.patch b/meta/recipes-support/libcap/files/0001-libcap-Add-build-ldflags-to-_makenames-rule.patch
new file mode 100644
index 00000000000..10ddf649359
--- /dev/null
+++ b/meta/recipes-support/libcap/files/0001-libcap-Add-build-ldflags-to-_makenames-rule.patch
@@ -0,0 +1,29 @@
+From e52d3232882c263f5bd4b1980195ac633d706a53 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 21 Oct 2025 18:27:51 -0700
+Subject: [PATCH] libcap: Add build ldflags to _makenames rule
+
+its calling compiler and linker in single step
+ensure that build ldflags are respected as it
+might have important information like which runtime
+to use.
+
+Upstream-Status: Backport [https://git.kernel.org/pub/scm/libs/libcap/libcap.git/commit/?id=c3ddf45d9afaab85d3b7db0dc7bfd1aafb8fde50]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libcap/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libcap/Makefile b/libcap/Makefile
+index e90a950..f0eb87e 100644
+--- a/libcap/Makefile
++++ b/libcap/Makefile
+@@ -80,7 +80,7 @@ $(PSXTITLE).pc: $(PSXTITLE).pc.in
+ 		$< >$@
+
+ _makenames: _makenames.c cap_names.list.h
+-	$(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@
++	$(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@ $(BUILD_LDFLAGS)
+
+ cap_names.h: _makenames
+ 	./_makenames > cap_names.h
diff --git a/meta/recipes-support/libcap/libcap_2.76.bb b/meta/recipes-support/libcap/libcap_2.76.bb
index c842246fc09..27093ff3e72 100644
--- a/meta/recipes-support/libcap/libcap_2.76.bb
+++ b/meta/recipes-support/libcap/libcap_2.76.bb
@@ -12,7 +12,9 @@ LIC_FILES_CHKSUM = "file://License;md5=2965a646645b72ecee859b43c592dcaa \
 
 DEPENDS = "hostperl-runtime-native gperf-native"
 
-SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${PV}.tar.xz"
+SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${PV}.tar.xz \
+           file://0001-libcap-Add-build-ldflags-to-_makenames-rule.patch \
+		   "
 SRC_URI:append:class-nativesdk = " \
            file://0001-nativesdk-libcap-Raise-the-size-of-arrays-containing.patch \
            "
@@ -37,6 +39,8 @@ EXTRA_OEMAKE = " \
 do_compile() {
 	oe_runmake \
 		AR="${AR}" \
+		BUILD_CC="${BUILD_CC}" \
+		BUILD_LDFLAGS="${BUILD_LDFLAGS}" \
 		CC="${CC}" \
 		RANLIB="${RANLIB}" \
 		OBJCOPY="${OBJCOPY}"