diff mbox series

[meta-oe,6/7] rwmem: upgrade 1.2 -> 2.0

Message ID 20251223061043.659-6-liuyd.fnst@fujitsu.com
State New
Headers show
Series [meta-oe,1/7] flatpak: upgrade 1.17.0 -> 1.17.2 | expand

Commit Message

Liu Yiding Dec. 23, 2025, 6:10 a.m. UTC 
2. Pyrwmem and static-libc build option has been removed in 2.0.

Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
---
 .../rwmem/0001-include-missing-cstdint.patch  | 32 -------------------
 .../rwmem/{rwmem_1.2.bb => rwmem_2.0.bb}      | 16 ++--------
 2 files changed, 3 insertions(+), 45 deletions(-)
 delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem/0001-include-missing-cstdint.patch
 rename meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/{rwmem_1.2.bb => rwmem_2.0.bb} (64%)
diff mbox series

Patch

diff --git a/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem/0001-include-missing-cstdint.patch b/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem/0001-include-missing-cstdint.patch
deleted file mode 100644
index 0560daa4c2..0000000000
--- a/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem/0001-include-missing-cstdint.patch
+++ /dev/null
@@ -1,32 +0,0 @@ 
-From 84e884f99e581515b49d8973538bb17e1e6c0dc0 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 26 Jan 2023 20:45:57 -0800
-Subject: [PATCH] include missing <cstdint>
-
-gcc 13 moved some includes around and as a result <cstdint> is no
-longer transitively included [1]. Explicitly include it for
-uint{32,64}_t.
-
-[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
-
-Upstream-Status: Submitted [https://github.com/tomba/rwmem/pull/7]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- librwmem/helpers.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/librwmem/helpers.h b/librwmem/helpers.h
-index a0a738b..8d02c9c 100644
---- a/librwmem/helpers.h
-+++ b/librwmem/helpers.h
-@@ -1,6 +1,7 @@
- #pragma once
- 
- #include <cerrno>
-+#include <cstdint>
- #include <string>
- #include <vector>
- #include <string.h>
--- 
-2.39.1
-
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb b/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_2.0.bb
similarity index 64%
rename from meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb
rename to meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_2.0.bb
index 078be849a3..aea81ee23f 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb
+++ b/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_2.0.bb
@@ -14,22 +14,12 @@  LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 DEPENDS += "fmt libinih"
 
-PV .= "+git"
+SRCREV = "d8dda76a0d8bc3356120d087f783d237602e0278"
 
-SRCREV = "8416326777b2aada0706539b8f9f6acefa476b16"
+SRC_URI = "git://github.com/tomba/rwmem.git;protocol=https;name=rwmem;branch=master;tag=${PV}"
 
-SRC_URI = "git://github.com/tomba/rwmem.git;protocol=https;name=rwmem;branch=master \
-           file://0001-include-missing-cstdint.patch"
-
-
-inherit meson pkgconfig python3native
-
-PACKAGECONFIG ?= "python static"
-PACKAGECONFIG[python] = "-Dpyrwmem=enabled,-Dpyrwmem=disabled,cmake-native python3 python3-pybind11"
-PACKAGECONFIG[static] = "-Dstatic-libc=true,-Dstatic-libc=false,"
+inherit meson pkgconfig
 
 do_install:append() {
 	install -D -m 0644 ${B}/librwmem/librwmem.a ${D}${libdir}/librwmem.a
 }
-
-FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}/pyrwmem"