From ecdbee43118d28dbfee31c58ef99c58b1b050cca Mon Sep 17 00:00:00 2001 From: Wildan M Date: Mon, 27 Jul 2026 16:03:27 +0200 Subject: [PATCH] Fix 4 recipes compilation --- bin/x86_64-unknown-redox-llvm-config | 4 ++-- recipes/core/profiling-kernel/recipe.toml | 5 ++--- recipes/emulators/rvvm/recipe.toml | 17 ++--------------- .../x11/mate/mate-session-manager/recipe.toml | 1 + 4 files changed, 7 insertions(+), 20 deletions(-) diff --git a/bin/x86_64-unknown-redox-llvm-config b/bin/x86_64-unknown-redox-llvm-config index edf868688..6014929ab 100755 --- a/bin/x86_64-unknown-redox-llvm-config +++ b/bin/x86_64-unknown-redox-llvm-config @@ -19,8 +19,8 @@ ARCH_MAP = { "riscv64gc": ("RISCV", "riscv", "RISCV"), } -ALL_ARCH_COMPS = ["x86", "aarch64", "riscv"] -ALL_ARCH_LIBS = ["X86", "AArch64", "RISCV"] +ALL_ARCH_COMPS = ["x86", "aarch64", "riscv", "webassembly"] +ALL_ARCH_LIBS = ["X86", "AArch64", "RISCV", "WebAssembly"] def is_unwanted_arch(item, allowed_prefix, all_prefixes, is_lib=False): matched_arch = None diff --git a/recipes/core/profiling-kernel/recipe.toml b/recipes/core/profiling-kernel/recipe.toml index 77f200e20..26c8bb4b1 100644 --- a/recipes/core/profiling-kernel/recipe.toml +++ b/recipes/core/profiling-kernel/recipe.toml @@ -4,7 +4,6 @@ same_as = "../kernel" [build] template = "custom" script = """ -make -f ${COOKBOOK_SOURCE}/Makefile KERNEL_CARGO_FEATURES=profiling -mkdir -pv "${COOKBOOK_STAGE}/usr/lib/boot" -cp -v kernel "${COOKBOOK_STAGE}/usr/lib/boot" +cd "${COOKBOOK_SOURCE}" +make install BUILD="${COOKBOOK_BUILD}" DESTDIR="${COOKBOOK_STAGE}" KERNEL_CARGO_FEATURES=profiling """ diff --git a/recipes/emulators/rvvm/recipe.toml b/recipes/emulators/rvvm/recipe.toml index c98185fb1..d6f4a25ea 100644 --- a/recipes/emulators/rvvm/recipe.toml +++ b/recipes/emulators/rvvm/recipe.toml @@ -1,36 +1,23 @@ [source] git = "https://github.com/LekKit/RVVM.git" -upstream = "https://github.com/LekKit/RVVM" [build] template = "custom" -# SDL2 is tough to link statically, use SDL1 for now +# TODO: Use SDL2? dependencies = [ "sdl1", "liborbital", ] script = """ - +DYNAMIC_INIT export BUILDDIR="${COOKBOOK_BUILD}" export DESTDIR="${COOKBOOK_STAGE}" - -# Redox currently doesn't support dynamic library loading -export LDFLAGS="${LDFLAGS} $(pkg-config --libs sdl)" - -# Networking is currently broken on Redox (missing setsockopt?) -export USE_NET=0 - # Use SDL1 export USE_SDL=1 - -# Building a shared library is currently broken on Redox -export USE_LIB=0 - export OS=Redox # Let's goo "${COOKBOOK_MAKE}" install -C "${COOKBOOK_SOURCE}" - """ diff --git a/recipes/wip/x11/mate/mate-session-manager/recipe.toml b/recipes/wip/x11/mate/mate-session-manager/recipe.toml index d021c0232..16ba7550f 100644 --- a/recipes/wip/x11/mate/mate-session-manager/recipe.toml +++ b/recipes/wip/x11/mate/mate-session-manager/recipe.toml @@ -12,6 +12,7 @@ dependencies = [ "gtk3", "libsm", "libxcomposite", + "mesa-x11", ] template = "custom" script = """