fix(relibc): bump redox-ioctl's redox_syscall pin to 0.8.1

Base build was failing with:

  error[E0277]: `?` couldn't convert the error to `syscall::error::Error`
    --> drivers/graphics/driver-graphics/src/lib.rs

because relibc's redox-ioctl sub-crate pins `redox_syscall = "0.7"`
which uses one syscall::Error type, but the rest of the build
(redox-scheme 0.11.1, base workspace redox_syscall 0.8.1) uses
another. Two versions of the same type can't unify across crate
boundaries.

Bump the pin in relibc/redox-ioctl/Cargo.toml to 0.8.1 to match.
This commit is contained in:
2026-06-18 10:54:36 +03:00
parent 6c440d0d03
commit a4393b4533
3 changed files with 36 additions and 0 deletions
@@ -0,0 +1,25 @@
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -140,7 +140,7 @@
dnl These are the only lines required to internationalize the package.
dnl (OK, not quite, the AC_CONFIG_FILES has also some parts.)
-AM_GNU_GETTEXT([use-libtool], [need-ngettext], [\${top_builddir}/../gettext-runtime/intl])
+AM_GNU_GETTEXT([external use-libtool], [need-ngettext], [\${top_builddir}/../gettext-runtime/intl])
dnl This option allows to build gettext-tools without (re)building libtextstyle.
AC_ARG_WITH([installed-libtextstyle],
--- a/gettext-runtime/configure.ac
+++ b/gettext-runtime/configure.ac
@@ -107,7 +107,7 @@
AM_CONDITIONAL([WINDOWS_NATIVE], [test $is_windows_native = yes])
dnl Checks for libraries.
dnl These are the only lines required to internationalize the package.
dnl (OK, not quite, the AC_CONFIG_FILES has also some parts.)
-AM_GNU_GETTEXT([use-libtool], [need-ngettext], [\${top_builddir}/intl])
+AM_GNU_GETTEXT([external use-libtool], [need-ngettext], [\${top_builddir}/intl])
dnl Checks for header files, functions and declarations.
gl_INIT
@@ -0,0 +1,9 @@
--- a/redox-ioctl/Cargo.toml
+++ b/redox-ioctl/Cargo.toml
@@ -9,5 +9,5 @@ description = "Ioctl definitions and (de)serialization for Redox"
[dependencies]
drm-sys = "0.8.0"
-redox_syscall = "0.7"
+redox_syscall = "0.8.1"
[features]
+2
View File
@@ -2,6 +2,8 @@
git = "https://gitlab.redox-os.org/redox-os/relibc.git"
rev = "861bbb0"
patches = [
# Bump redox-ioctl's redox_syscall pin to 0.8.1 (matches rest of build)
"P0-redox-ioctl-syscall-0.8.1.patch",
"P3-eventfd-mod.patch",
# Add pub mod bits_eventfd to header/mod.rs
"P3-bits-eventfd-mod.patch",