MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-17 23:44:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'meson-discovery' into 'master'

Browse Source 
Set meson cross file prefix to /usr

See merge request redox-os/cookbook!533
This commit is contained in:
Jeremy Soller 2025-07-08 06:03:18 -06:00
commit d326fc9ae9
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
recipes/libs/mesa/recipe.toml
View File

@ -31,5 +31,5 @@ cookbook_meson
# Hack to add LLVM libs
#TODO: only add necessary LLVM libs, not all of them
sed -i "s/ -lOSMesa / -lOSMesa $("${LLVM_CONFIG}" --libs) -lstdc++ /" "${COOKBOOK_STAGE}/usr/local/lib/pkgconfig/osmesa.pc"
sed -i "s/ -lOSMesa / -lOSMesa $("${LLVM_CONFIG}" --libs) -lstdc++ /" "${COOKBOOK_STAGE}/usr/lib/pkgconfig/osmesa.pc"
"""

5
src/bin/cook.rs
View File

@ -920,6 +920,11 @@ function cookbook_meson {
echo "cpu = '$(echo "${TARGET}" | cut -d - -f1)'" >> cross_file.txt
echo "endian = 'little'" >> cross_file.txt
echo "[paths]" >> cross_file.txt
echo "prefix = '/usr'" >> cross_file.txt
echo "libdir = 'lib'" >> cross_file.txt
echo "bindir = 'bin'" >> cross_file.txt
echo "[properties]" >> cross_file.txt
echo "needs_exe_wrapper = true" >> cross_file.txt
echo "sys_root = '${COOKBOOK_SYSROOT}'" >> cross_file.txt