From 49bb9d8b64f7b89d77482fe69933dce20918efa6 Mon Sep 17 00:00:00 2001 From: Wildan Mubarok Date: Mon, 7 Jul 2025 22:26:37 +0000 Subject: [PATCH] Set meson cross file prefix to /usr --- recipes/libs/mesa/recipe.toml | 2 +- src/bin/cook.rs | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes/libs/mesa/recipe.toml b/recipes/libs/mesa/recipe.toml index bda5d5f2..aa7b394c 100644 --- a/recipes/libs/mesa/recipe.toml +++ b/recipes/libs/mesa/recipe.toml @@ -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" """ diff --git a/src/bin/cook.rs b/src/bin/cook.rs index 658e0a8a..6f29b7a8 100644 --- a/src/bin/cook.rs +++ b/src/bin/cook.rs @@ -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