Merge branch 'change-py' into 'master'

Replace rustpython to python312

See merge request redox-os/redox!1997
This commit is contained in:
Jeremy Soller 2026-03-10 07:47:23 -06:00
commit d81a3133ec
6 changed files with 10 additions and 10 deletions

View File

@ -893,8 +893,8 @@ redox()
patch \
pkgar \
pkg-config \
python312 \
rust \
rustpython \
sdl1 \
sdl2-ttf \
vim"

View File

@ -5,12 +5,13 @@ blake3 = "e51c2f347e3185479d5ff95cae8ac77511db486853269443c56bedaa0a6ae629"
[build]
template = "custom"
script = """
DYNAMIC_INIT
rsync -av --delete "${COOKBOOK_SOURCE}/" ./
"${COOKBOOK_MAKE}" -j"${COOKBOOK_MAKE_JOBS}" posix \
AR="${TARGET}-ar rcu" \
CC="${CC_WRAPPER} ${TARGET}-gcc -std=gnu99" \
RANLIB="${TARGET}-ranlib" \
SYSLDFLAGS="-static"
AR="${AR} rcu" \
CC="${CC} -std=gnu99" \
RANLIB="${RANLIB}" \
SYSLDFLAGS="$LDFLAGS"
"${COOKBOOK_MAKE}" install INSTALL_TOP="${COOKBOOK_STAGE}"
"""

View File

@ -1,6 +1,6 @@
[source]
git = "https://github.com/RustPython/RustPython"
# newer rev requires TLS 1.3 (openssl3) and 'bits/libc-header-start.h' for bindgen
# newer rev requires 'bits/libc-header-start.h' for bindgen
rev = "2025-10-13-main-51"
shallow_clone = true
patches = [

View File

@ -16,6 +16,5 @@ dependencies = [
"orbutils",
"patchelf",
"pop-icon-theme",
"rustpython",
"shared-mime-info",
]

View File

@ -7,13 +7,13 @@ dependencies = [
"gnu-binutils",
"gnu-make",
"gnu-grep",
"perl5",
"python312",
"ripgrep",
"rustpython",
"lua54",
"nasm",
"patch",
"pkg-config",
"rust",
"sed",
"strace",
]

View File

@ -25,7 +25,7 @@ dependencies = [
"nasm",
"pkg-config",
"pkgar",
"rustpython",
"python312",
"sed",
"wget",
]