From patchwork Tue Nov 3 23:16:03 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "mark.yang" X-Patchwork-Id: 102824 Received: from lgeamrelo13.lge.com (lgeamrelo13.lge.com [156.147.23.53]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.2687.1793747773055131540 for ; Tue, 03 Nov 2026 15:16:13 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: lge.com, ip: 156.147.23.53, mailfrom: mark.yang@lge.com) Received: from unknown (HELO lgeamrelo04.lge.com) (156.147.1.127) by 156.147.23.53 with ESMTP; 4 Nov 2026 08:16:10 +0900 X-Original-SENDERIP: 156.147.1.127 X-Original-MAILFROM: mark.yang@lge.com Received: from unknown (HELO markyang..) (10.177.122.207) by 156.147.1.127 with ESMTP; 4 Nov 2026 08:16:10 +0900 X-Original-SENDERIP: 10.177.122.207 X-Original-MAILFROM: mark.yang@lge.com From: mark.yang@lge.com To: openembedded-core@lists.openembedded.org Cc: Khem Raj , Martin Jansa , "mark.yang" Subject: [PATCH 2/6] musl: wrap the bits headers for multilib Date: Wed, 4 Nov 2026 08:16:03 +0900 Message-ID: <20261103231607.4021851-3-mark.yang@lge.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20261103231607.4021851-1-mark.yang@lge.com> References: <20261103231607.4021851-1-mark.yang@lge.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by lin-tor-korg-lkml-alma10-1 with HTTPS for ; Tue, 03 Nov 2026 23:16:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/249302 From: "mark.yang" Pass every installed bits/*.h through oe_multilib_header, as glibc-package.inc does for the glibc ones. Unlike glibc, musl keeps all of its arch headers in bits/. Which of them differ depends on the arch pair and the musl release, so all of them are wrapped instead of keeping a list. Signed-off-by: mark.yang --- meta/recipes-core/musl/musl_git.bb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index b53b4be84c..b8fef8990e 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -2,7 +2,7 @@ # Released under the MIT license (see COPYING.MIT for the terms) require musl.inc -inherit linuxloader +inherit linuxloader multilib_header SRCREV = "c4e1bb3994c14ed5112c894d15a451bf00f0d501" @@ -69,6 +69,13 @@ do_install() { echo "${libdir}" >> ${D}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path rm -f ${D}${bindir}/ldd ${D}${GLIBC_LDSO} ln -rs ${D}${libdir}/libc.so ${D}${bindir}/ldd + musl_multilib_bits +} + +musl_multilib_bits () { + for h in ${D}${includedir}/bits/*.h; do + oe_multilib_header bits/${h##*/} + done } FILES:${PN} += "${nonarch_base_libdir}/ld-musl-${MUSL_LDSO_ARCH}.so.1 ${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path"