From dac624de3ed5cba0bf953c3e15632ad847e384b7 Mon Sep 17 00:00:00 2001 From: "deepan.shivap" Date: Tue, 3 Dec 2024 14:49:56 +0900 Subject: ot-br-posix: Fix Musl build error Mistakenly removed musl-fixes.patch in previous commit. update & Include 0001-Musl-build-fix.patch based on latest upstream of ot-br-posix Remove CXXFLAGS:append:libc-musl:toolchain-clang = " -Wno-error=sign-compare -Wno-error=unused-but-set-variable", as issue is not reproducible with current SRCREV of ot-br-posix. Signed-off-by: deepan.shivap Signed-off-by: Khem Raj --- .../ot-br-posix/0001-Musl-build-fix.patch | 27 ++++++++++++++++++++++ .../openthread/ot-br-posix_git.bb | 4 +--- 2 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-Musl-build-fix.patch diff --git a/meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-Musl-build-fix.patch b/meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-Musl-build-fix.patch new file mode 100644 index 0000000000..108ed76b30 --- /dev/null +++ b/meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-Musl-build-fix.patch @@ -0,0 +1,27 @@ +From 502aa4ab4bbc790fb2999ff2b5f10dabd7085190 Mon Sep 17 00:00:00 2001 +From: "deepan.shivap" +Date: Mon, 2 Dec 2024 23:12:17 +0900 +Subject: [PATCH] Musl build fix + +usage of getaddrinfo_a creates dependency on libanl, which is specific +to glibc. + +Upstream-Status: Pending +Signed-off-by: deepan.shivap +--- + src/posix/platform/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/posix/platform/CMakeLists.txt b/src/posix/platform/CMakeLists.txt +index b4ac241f5..7b2028e45 100644 +--- a/src/posix/platform/CMakeLists.txt ++++ b/src/posix/platform/CMakeLists.txt +@@ -175,7 +175,7 @@ target_link_libraries(openthread-posix + ) + + option(OT_TARGET_OPENWRT "enable openthread posix for OpenWRT" OFF) +-if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT OT_TARGET_OPENWRT) ++if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT OT_TARGET_OPENWRT AND NOT OT_TARGET_MUSL) + target_compile_definitions(ot-posix-config + INTERFACE "OPENTHREAD_POSIX_CONFIG_NAT64_AIL_PREFIX_ENABLE=1" + ) diff --git a/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb b/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb index 8183f52033..f4c193a8e8 100644 --- a/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb +++ b/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb @@ -19,15 +19,13 @@ SRC_URI = "gitsm://github.com/openthread/ot-br-posix.git;protocol=https;branch=m file://0001-cmake-Disable-nonnull-compare-warning-on-gcc.patch \ file://default-cxx-std.patch \ file://0001-fix-build-on-GCC-14-for-yocto.patch;patchdir=third_party/openthread/repo \ + file://0001-Musl-build-fix.patch;patchdir=third_party/openthread/repo \ " S = "${WORKDIR}/git" SYSTEMD_SERVICE:${PN} = "otbr-agent.service" inherit pkgconfig cmake systemd -# openthread/repo/src/cli/cli.cpp:1786:18: fatal error: variable 'i' set but not used [-Wunused-but-set-variable] -# for (uint8_t i = 0;; i++) -CXXFLAGS:append:libc-musl:toolchain-clang = " -Wno-error=sign-compare -Wno-error=unused-but-set-variable" LDFLAGS:append:riscv32 = " -latomic" -- cgit v1.2.3-54-g00ecf