From ad85d9bf0c4f2e8f0308ae087bf52fef0a2c79a6 Mon Sep 17 00:00:00 2001
From: Admin Pupkin <adminpupkin@gmail.com>
Date: Sat, 30 May 2026 08:00:29 +0300
Subject: [PATCH] fix: daemon scheme_root/create_this_scheme_fd error
 conversion
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix 4 E0277 errors in daemon/src/lib.rs where scheme_root()
and create_this_scheme_fd() return syscall::error::Error but
the function returns syscall::Error. Add .map_err() conversions.

redox-driver-sys errors (6 remaining E0308/E0061 in dma.rs/io.rs)
are pre-existing API mismatches between libredox and redox_syscall
crate versions — not addressed here.
---
 local/recipes/gpu/redox-drm/source/daemon/src/lib.rs | 8 ++++----
 recipes/dev/python312/recipe.toml                    | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/local/recipes/gpu/redox-drm/source/daemon/src/lib.rs b/local/recipes/gpu/redox-drm/source/daemon/src/lib.rs
index c1fe30e652..995a420830 100644
--- a/local/recipes/gpu/redox-drm/source/daemon/src/lib.rs
+++ b/local/recipes/gpu/redox-drm/source/daemon/src/lib.rs
@@ -135,8 +135,8 @@ impl SchemeDaemon {
         socket: &Socket,
         scheme: &mut S,
     ) -> syscall::Result<()> {
-        let cap_id = scheme.scheme_root()?;
-        let cap_fd = socket.create_this_scheme_fd(0, cap_id, 0, 0)?;
+        let cap_id = scheme.scheme_root().map_err(|e| syscall::Error::new(e.errno))?;
+        let cap_fd = socket.create_this_scheme_fd(0, cap_id, 0, 0).map_err(|e| syscall::Error::new(e.errno))?;
         self.ready_with_fd(Fd::new(cap_fd))
     }
 
@@ -146,8 +146,8 @@ impl SchemeDaemon {
         socket: &Socket,
         scheme: &mut S,
     ) -> syscall::Result<()> {
-        let cap_id = scheme.scheme_root()?;
-        let cap_fd = socket.create_this_scheme_fd(0, cap_id, 0, 0)?;
+        let cap_id = scheme.scheme_root().map_err(|e| syscall::Error::new(e.errno))?;
+        let cap_fd = socket.create_this_scheme_fd(0, cap_id, 0, 0).map_err(|e| syscall::Error::new(e.errno))?;
         self.ready_with_fd(Fd::new(cap_fd))
     }
 }
diff --git a/recipes/dev/python312/recipe.toml b/recipes/dev/python312/recipe.toml
index 28667c57f0..c56916e3d4 100644
--- a/recipes/dev/python312/recipe.toml
+++ b/recipes/dev/python312/recipe.toml
@@ -40,6 +40,8 @@ if [ "$TARGET" != "$COOKBOOK_HOST_TARGET" ]; then
     )
 else
     COOKBOOK_CONFIGURE_FLAGS=(--prefix=/usr)
+    # redoxer host sysroot may not define LONG_BIT via <limits.h>
+    export CFLAGS="${CFLAGS:-} -DLONG_BIT=64"
 fi
 
 if [ "${COOKBOOK_DYNAMIC}" != "1" ]; then