mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-11-04 19:56:36 +08:00
Fix 4 recipes compilation
This commit is contained in:
parent
67f36dfb7f
commit
ecdbee4311
@ -19,8 +19,8 @@ ARCH_MAP = {
|
|||||||
"riscv64gc": ("RISCV", "riscv", "RISCV"),
|
"riscv64gc": ("RISCV", "riscv", "RISCV"),
|
||||||
}
|
}
|
||||||
|
|
||||||
ALL_ARCH_COMPS = ["x86", "aarch64", "riscv"]
|
ALL_ARCH_COMPS = ["x86", "aarch64", "riscv", "webassembly"]
|
||||||
ALL_ARCH_LIBS = ["X86", "AArch64", "RISCV"]
|
ALL_ARCH_LIBS = ["X86", "AArch64", "RISCV", "WebAssembly"]
|
||||||
|
|
||||||
def is_unwanted_arch(item, allowed_prefix, all_prefixes, is_lib=False):
|
def is_unwanted_arch(item, allowed_prefix, all_prefixes, is_lib=False):
|
||||||
matched_arch = None
|
matched_arch = None
|
||||||
|
|||||||
@ -4,7 +4,6 @@ same_as = "../kernel"
|
|||||||
[build]
|
[build]
|
||||||
template = "custom"
|
template = "custom"
|
||||||
script = """
|
script = """
|
||||||
make -f ${COOKBOOK_SOURCE}/Makefile KERNEL_CARGO_FEATURES=profiling
|
cd "${COOKBOOK_SOURCE}"
|
||||||
mkdir -pv "${COOKBOOK_STAGE}/usr/lib/boot"
|
make install BUILD="${COOKBOOK_BUILD}" DESTDIR="${COOKBOOK_STAGE}" KERNEL_CARGO_FEATURES=profiling
|
||||||
cp -v kernel "${COOKBOOK_STAGE}/usr/lib/boot"
|
|
||||||
"""
|
"""
|
||||||
|
|||||||
@ -1,36 +1,23 @@
|
|||||||
[source]
|
[source]
|
||||||
git = "https://github.com/LekKit/RVVM.git"
|
git = "https://github.com/LekKit/RVVM.git"
|
||||||
upstream = "https://github.com/LekKit/RVVM"
|
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
template = "custom"
|
template = "custom"
|
||||||
|
|
||||||
# SDL2 is tough to link statically, use SDL1 for now
|
# TODO: Use SDL2?
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"sdl1",
|
"sdl1",
|
||||||
"liborbital",
|
"liborbital",
|
||||||
]
|
]
|
||||||
|
|
||||||
script = """
|
script = """
|
||||||
|
DYNAMIC_INIT
|
||||||
export BUILDDIR="${COOKBOOK_BUILD}"
|
export BUILDDIR="${COOKBOOK_BUILD}"
|
||||||
export DESTDIR="${COOKBOOK_STAGE}"
|
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
|
# Use SDL1
|
||||||
export USE_SDL=1
|
export USE_SDL=1
|
||||||
|
|
||||||
# Building a shared library is currently broken on Redox
|
|
||||||
export USE_LIB=0
|
|
||||||
|
|
||||||
export OS=Redox
|
export OS=Redox
|
||||||
|
|
||||||
# Let's goo
|
# Let's goo
|
||||||
"${COOKBOOK_MAKE}" install -C "${COOKBOOK_SOURCE}"
|
"${COOKBOOK_MAKE}" install -C "${COOKBOOK_SOURCE}"
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|||||||
@ -12,6 +12,7 @@ dependencies = [
|
|||||||
"gtk3",
|
"gtk3",
|
||||||
"libsm",
|
"libsm",
|
||||||
"libxcomposite",
|
"libxcomposite",
|
||||||
|
"mesa-x11",
|
||||||
]
|
]
|
||||||
template = "custom"
|
template = "custom"
|
||||||
script = """
|
script = """
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user