diff options
author | deepan.shivap <deepan.shivap@lge.com> | 2024-12-03 14:49:56 +0900 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2024-12-03 09:44:36 -0800 |
commit | dac624de3ed5cba0bf953c3e15632ad847e384b7 (patch) | |
tree | 2fb3f9b4046991a1cb2073400cfc6fad42f8d7f6 | |
parent | 353f14eb68b49e5edff012818ed520ce9b5a7a31 (diff) | |
download | meta-openembedded-dac624de3ed5cba0bf953c3e15632ad847e384b7.tar.gz |
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 <deepan.shivap@lge.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-Musl-build-fix.patch | 27 | ||||
-rw-r--r-- | meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb | 4 |
2 files changed, 28 insertions, 3 deletions
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 @@ | |||
1 | From 502aa4ab4bbc790fb2999ff2b5f10dabd7085190 Mon Sep 17 00:00:00 2001 | ||
2 | From: "deepan.shivap" <deepan.shivap@lge.com> | ||
3 | Date: Mon, 2 Dec 2024 23:12:17 +0900 | ||
4 | Subject: [PATCH] Musl build fix | ||
5 | |||
6 | usage of getaddrinfo_a creates dependency on libanl, which is specific | ||
7 | to glibc. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | Signed-off-by: deepan.shivap <deepan.shivap@lge.com> | ||
11 | --- | ||
12 | src/posix/platform/CMakeLists.txt | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/src/posix/platform/CMakeLists.txt b/src/posix/platform/CMakeLists.txt | ||
16 | index b4ac241f5..7b2028e45 100644 | ||
17 | --- a/src/posix/platform/CMakeLists.txt | ||
18 | +++ b/src/posix/platform/CMakeLists.txt | ||
19 | @@ -175,7 +175,7 @@ target_link_libraries(openthread-posix | ||
20 | ) | ||
21 | |||
22 | option(OT_TARGET_OPENWRT "enable openthread posix for OpenWRT" OFF) | ||
23 | -if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT OT_TARGET_OPENWRT) | ||
24 | +if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT OT_TARGET_OPENWRT AND NOT OT_TARGET_MUSL) | ||
25 | target_compile_definitions(ot-posix-config | ||
26 | INTERFACE "OPENTHREAD_POSIX_CONFIG_NAT64_AIL_PREFIX_ENABLE=1" | ||
27 | ) | ||
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 | |||
19 | file://0001-cmake-Disable-nonnull-compare-warning-on-gcc.patch \ | 19 | file://0001-cmake-Disable-nonnull-compare-warning-on-gcc.patch \ |
20 | file://default-cxx-std.patch \ | 20 | file://default-cxx-std.patch \ |
21 | file://0001-fix-build-on-GCC-14-for-yocto.patch;patchdir=third_party/openthread/repo \ | 21 | file://0001-fix-build-on-GCC-14-for-yocto.patch;patchdir=third_party/openthread/repo \ |
22 | file://0001-Musl-build-fix.patch;patchdir=third_party/openthread/repo \ | ||
22 | " | 23 | " |
23 | 24 | ||
24 | S = "${WORKDIR}/git" | 25 | S = "${WORKDIR}/git" |
25 | SYSTEMD_SERVICE:${PN} = "otbr-agent.service" | 26 | SYSTEMD_SERVICE:${PN} = "otbr-agent.service" |
26 | 27 | ||
27 | inherit pkgconfig cmake systemd | 28 | inherit pkgconfig cmake systemd |
28 | # openthread/repo/src/cli/cli.cpp:1786:18: fatal error: variable 'i' set but not used [-Wunused-but-set-variable] | ||
29 | # for (uint8_t i = 0;; i++) | ||
30 | CXXFLAGS:append:libc-musl:toolchain-clang = " -Wno-error=sign-compare -Wno-error=unused-but-set-variable" | ||
31 | 29 | ||
32 | LDFLAGS:append:riscv32 = " -latomic" | 30 | LDFLAGS:append:riscv32 = " -latomic" |
33 | 31 | ||