summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2025-12-24 13:14:36 -0800
committerKhem Raj <raj.khem@gmail.com>2025-12-24 13:18:31 -0800
commite4b25c0fcbd7bc4f72a66a09f4a86f41263f93e7 (patch)
tree827289e748d4dfbdf8c4e1942d7b398ea2cb41fb
parentfe1b915f23000918786580de24f5e68510ba9b79 (diff)
downloadmeta-openembedded-e4b25c0fcbd7bc4f72a66a09f4a86f41263f93e7.tar.gz
rwmem: Fix tests to build with musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem/0001-test_data_generator-Use-own-generic-htobe-template.patch49
-rw-r--r--meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_2.0.bb4
2 files changed, 52 insertions, 1 deletions
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem/0001-test_data_generator-Use-own-generic-htobe-template.patch b/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem/0001-test_data_generator-Use-own-generic-htobe-template.patch
new file mode 100644
index 0000000000..2a8f826b47
--- /dev/null
+++ b/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem/0001-test_data_generator-Use-own-generic-htobe-template.patch
@@ -0,0 +1,49 @@
1From fd59aeedac8ab75d044026b8ff32adf9aa485dea Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 24 Dec 2025 12:56:14 -0800
4Subject: [PATCH] test_data_generator: Use own generic htobe() template
5
6musl based builds expose this build failure where htobe32/htobe64 macros
7are in endian.h and it needs to be included. However, there is a local
8template in librwmem/endianness.h that can be used for
9better portability across platforms which
10might use different C library implementations
11
12
13Remove this patch when upgrading to 0.3 since the v2 tests are removed [1]
14
15[1] https://github.com/tomba/rwmem/commit/f9e0bffacd7520ee8975c4a36a9d47292d145ae9
16
17Upstream-Status: Inappropriate [Use of these macros are removed in master]
18
19Signed-off-by: Khem Raj <raj.khem@gmail.com>
20---
21 tests/test_data_generator.cpp | 6 +++---
22 1 file changed, 3 insertions(+), 3 deletions(-)
23
24diff --git a/tests/test_data_generator.cpp b/tests/test_data_generator.cpp
25index 39e1322..94e732d 100644
26--- a/tests/test_data_generator.cpp
27+++ b/tests/test_data_generator.cpp
28@@ -101,12 +101,12 @@ std::vector<uint8_t> TestRegisterFileBuilder::build() {
29
30 // Write header (RegisterFileData)
31 auto write_be32 = [&](uint32_t val) {
32- uint32_t be_val = htobe32(val);
33+ uint32_t be_val = htobe(val);
34 data.insert(data.end(), (uint8_t*)&be_val, (uint8_t*)&be_val + 4);
35 };
36
37 auto write_be64 = [&](uint64_t val) {
38- uint64_t be_val = htobe64(val);
39+ uint64_t be_val = htobe(val);
40 data.insert(data.end(), (uint8_t*)&be_val, (uint8_t*)&be_val + 8);
41 };
42
43@@ -169,4 +169,4 @@ std::vector<uint8_t> TestRegisterFileBuilder::build() {
44 }
45
46 return data;
47-}
48\ No newline at end of file
49+}
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_2.0.bb b/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_2.0.bb
index aea81ee23f..b89da34736 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_2.0.bb
+++ b/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_2.0.bb
@@ -16,7 +16,9 @@ DEPENDS += "fmt libinih"
16 16
17SRCREV = "d8dda76a0d8bc3356120d087f783d237602e0278" 17SRCREV = "d8dda76a0d8bc3356120d087f783d237602e0278"
18 18
19SRC_URI = "git://github.com/tomba/rwmem.git;protocol=https;name=rwmem;branch=master;tag=${PV}" 19SRC_URI = "git://github.com/tomba/rwmem.git;protocol=https;name=rwmem;branch=master;tag=${PV} \
20 file://0001-test_data_generator-Use-own-generic-htobe-template.patch \
21 "
20 22
21inherit meson pkgconfig 23inherit meson pkgconfig
22 24