ports: Clenup toolchain files

ports/install.sh

@@ -43,8 +43,10 @@ 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
 	cp "$BANAN_TOOLCHAIN_DIR/meson-cross-file.in" "$MESON_CROSS_FILE"
 	sed -i "s|ARCH|$BANAN_ARCH|" "$MESON_CROSS_FILE"
-	sed -i "s|CMAKE|$BANAN_CMAKE|" "$MESON_CROSS_FILE"
 	sed -i "s|SYSROOT|$BANAN_SYSROOT|" "$MESON_CROSS_FILE"
+	sed -i "s|PKG_CONFIG|$BANAN_PORT_DIR/pkg-config|" "$MESON_CROSS_FILE"
+	sed -i "s|CMAKE_BINARY|$BANAN_CMAKE|" "$MESON_CROSS_FILE"
+	sed -i "s|CMAKE_TOOLCHAIN|$BANAN_TOOLCHAIN_DIR/Toolchain.txt|" "$MESON_CROSS_FILE"
 fi
 
 MAKE_BUILD_TARGETS=('all')

toolchain/Toolchain.txt

@@ -16,13 +16,11 @@ set(TOOLCHAIN_PREFIX $ENV{BANAN_TOOLCHAIN_PREFIX})
 set(CMAKE_SYSTEM_NAME banan-os)
 set(CMAKE_SYSTEM_PROCESSOR ${BANAN_ARCH})
 
-set(CMAKE_SYSROOT ${BANAN_SYSROOT})
-set(CMAKE_STAGING_PREFIX ${BANAN_SYSROOT}/usr)
-
+set(CMAKE_FIND_ROOT_PATH ${BANAN_SYSROOT})
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE BOTH)
+set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED True)

toolchain/meson-cross-file.in

@@ -11,11 +11,12 @@ ar = 'ARCH-pc-banan_os-ar'
 ld = 'ARCH-pc-banan_os-ld'
 objcopy = 'ARCH-pc-banan_os-objcopy'
 strip = 'ARCH-pc-banan_os-strip'
-pkg-config = 'pkg-config'
-cmake = 'CMAKE'
+pkg-config = 'PKG_CONFIG'
+cmake = 'CMAKE_BINARY'
 
 glib-compile-schemas = '/usr/bin/glib-compile-schemas'
 glib-compile-resources = '/usr/bin/glib-compile-resources'
 
 [properties]
 sys_root='SYSROOT'
+cmake_toolchain_file='CMAKE_TOOLCHAIN'