diff mbox series

[meta-oe,09/26] switchtec-user: include switchtec-endian.h for musl htole32/le32toh

Message ID 20260929225723.1046705-9-khem.raj@oss.qualcomm.com
State New
Headers show
Series [meta-oe,01/26] canvenient: include <sys/time.h> for struct timeval on musl | expand

Commit Message

Khem Raj Sept. 29, 2026, 10:57 p.m. UTC 
lib/cap-cli-main.c uses htole32()/le32toh() from <endian.h> without
including it directly; pull it in via the project's own endian
compat header.

AI-Generated: Uses Claude Code

Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
---
 ...n-include-switchtec-endian.h-for-mus.patch | 44 +++++++++++++++++++
 .../switchtec-user/switchtec-user_4.4.bb      |  1 +
 2 files changed, 45 insertions(+)
 create mode 100644 meta-oe/recipes-support/switchtec-user/switchtec-user/0002-lib-cap-cli-main-include-switchtec-endian.h-for-mus.patch
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/switchtec-user/switchtec-user/0002-lib-cap-cli-main-include-switchtec-endian.h-for-mus.patch b/meta-oe/recipes-support/switchtec-user/switchtec-user/0002-lib-cap-cli-main-include-switchtec-endian.h-for-mus.patch
new file mode 100644
index 0000000000..c59e76e496
--- /dev/null
+++ b/meta-oe/recipes-support/switchtec-user/switchtec-user/0002-lib-cap-cli-main-include-switchtec-endian.h-for-mus.patch
@@ -0,0 +1,44 @@ 
+From: Khem Raj <khem.raj@oss.qualcomm.com>
+Date: Tue, 29 Sep 2026 01:56:40 +0000
+Subject: [PATCH] lib/cap, cli/main: include switchtec/endian.h for musl
+
+lib/cap.c and cli/main.c call htole32()/le32toh()/le64toh() etc.
+without including inc/switchtec/endian.h, the project's own portable
+endian-conversion shim (already used by lib/diag.c, lib/switchtec.c,
+lib/pmon.c, lib/fw.c, lib/fabric.c, cli/mfg.c and cli/diag.c). On
+glibc this went unnoticed because some other transitively-included
+header happens to pull in <endian.h> as a side effect, but musl's
+headers don't have that side effect, so building with musl libc fails
+with "call to undeclared function 'htole32'" and friends. Add the
+missing include to both files so they pick up the same <endian.h>
+declarations (switchtec/endian.h just wraps <endian.h> on Linux,
+which musl provides unconditionally, unlike glibc which historically
+gated it behind feature-test macros).
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
+---
+diff --git a/cli/main.c b/cli/main.c
+index 6dc4524..b0bdcc3 100644
+--- a/cli/main.c
++++ b/cli/main.c
+@@ -33,6 +33,7 @@
+ #include <switchtec/errors.h>
+ #include <switchtec/utils.h>
+ #include <switchtec/pci.h>
++#include <switchtec/endian.h>
+ 
+ #include <locale.h>
+ #include <time.h>
+diff --git a/lib/cap.c b/lib/cap.c
+index b10685f..52ee3f5 100644
+--- a/lib/cap.c
++++ b/lib/cap.c
+@@ -32,6 +32,7 @@
+ #include "switchtec/cap.h"
+ #include "switchtec/switchtec.h"
+ #include "switchtec/mrpc.h"
++#include "switchtec/endian.h"
+ #include "switchtec_priv.h"
+ 
+ #include <stddef.h>
diff --git a/meta-oe/recipes-support/switchtec-user/switchtec-user_4.4.bb b/meta-oe/recipes-support/switchtec-user/switchtec-user_4.4.bb
index 61d431178a..32c75c1bfe 100644
--- a/meta-oe/recipes-support/switchtec-user/switchtec-user_4.4.bb
+++ b/meta-oe/recipes-support/switchtec-user/switchtec-user_4.4.bb
@@ -8,6 +8,7 @@  DEPENDS = "ncurses openssl"
 
 SRC_URI = "git://github.com/Microsemi/switchtec-user.git;protocol=https;branch=master;tag=v${PV} \
            file://0001-lib-diag-do-not-use-a-variable-length-array-in-a-str.patch \
+           file://0002-lib-cap-cli-main-include-switchtec-endian.h-for-mus.patch \
            "
 SRCREV = "d995512f3bf1ceb98eefada813642d5ba5d62cd1"