Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BuildSystem: Fix meson toolchain file 

sed to replace SYSROOT did not work because paths contain /

also add cmake to allow cmake based library detection
This commit is contained in:
Bananymous 2025-08-01 22:59:08 +03:00
parent 21009c37b4
commit f35a6b3922
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ports/install.sh
View File

@ -42,8 +42,9 @@ fi
export MESON_CROSS_FILE="$BANAN_PORT_DIR/$BANAN_ARCH-banan_os-meson.txt" export MESON_CROSS_FILE="$BANAN_PORT_DIR/$BANAN_ARCH-banan_os-meson.txt"
if [ ! -f "$MESON_CROSS_FILE" ] || [ "$MESON_CROSS_FILE" -ot "$BANAN_TOOLCHAIN_DIR/meson-cross-file.in" ]; then if [ ! -f "$MESON_CROSS_FILE" ] || [ "$MESON_CROSS_FILE" -ot "$BANAN_TOOLCHAIN_DIR/meson-cross-file.in" ]; then
cp "$BANAN_TOOLCHAIN_DIR/meson-cross-file.in" "$MESON_CROSS_FILE" cp "$BANAN_TOOLCHAIN_DIR/meson-cross-file.in" "$MESON_CROSS_FILE"
sed -i "s/ARCH/$BANAN_ARCH/" "$MESON_CROSS_FILE" sed -i "s|ARCH|$BANAN_ARCH|" "$MESON_CROSS_FILE"
sed -i "s/SYSROOT/$BANAN_SYSROOT/" "$MESON_CROSS_FILE" sed -i "s|CMAKE|$BANAN_CMAKE|" "$MESON_CROSS_FILE"
sed -i "s|SYSROOT|$BANAN_SYSROOT|" "$MESON_CROSS_FILE"
fi fi
MAKE_BUILD_TARGETS=('all') MAKE_BUILD_TARGETS=('all')

3
toolchain/meson-cross-file.in
View File

@ -11,7 +11,8 @@ ar = 'ARCH-pc-banan_os-ar'
ld = 'ARCH-pc-banan_os-ld' ld = 'ARCH-pc-banan_os-ld'
objcopy = 'ARCH-pc-banan_os-objcopy' objcopy = 'ARCH-pc-banan_os-objcopy'
strip = 'ARCH-pc-banan_os-strip' strip = 'ARCH-pc-banan_os-strip'
pkgconfig = 'pkg-config' pkg-config = 'pkg-config'
cmake = 'CMAKE'
[properties] [properties]
sys_root='SYSROOT' sys_root='SYSROOT'