Merge branch 'rev-glvnd' into 'master'

Revert using libglvnd

See merge request redox-os/redox!2353
This commit is contained in:
Jeremy Soller 2026-09-19 06:26:40 -06:00
commit ca58dbd79a

View File

@ -11,7 +11,8 @@ dependencies = [
"liborbital",
"llvm21",
"zlib",
"libglvnd",
# disabled, see https://gitlab.redox-os.org/redox-os/redox/-/work_items/1883
# "libglvnd",
]
dev-dependencies = [
"llvm21.dev",
@ -46,8 +47,3 @@ LLVMLIBS="-lLLVMBitReader -lLLVMCore -lLLVMExecutionEngine -lLLVMInstCombine -lL
LLVMLIBS+=" -lLLVMMCJIT -lLLVMScalarOpts -lLLVMTransformUtils -lLLVMCoroutines -lLLVMLTO"
sed -i "s/ -lOSMesa / -lOSMesa ${LLVMLIBS} -lstdc++ /" "${COOKBOOK_STAGE}/usr/lib/pkgconfig/osmesa.pc"
"""
[package]
dependencies = [
"libglvnd"
]