From 05250083b97a56fc5228cd0c05958613cfedb6b9 Mon Sep 17 00:00:00 2001
From: Bananymous <oskari.alaranta@bananymous.com>
Date: Mon, 25 May 2026 15:54:07 +0300
Subject: [PATCH] ports: Clenup toolchain files

---
 ports/install.sh              | 4 +++-
 toolchain/Toolchain.txt       | 6 ++----
 toolchain/meson-cross-file.in | 5 +++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ports/install.sh b/ports/install.sh
index 8035c20a..2485a8df 100755
--- a/ports/install.sh
+++ b/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')
diff --git a/toolchain/Toolchain.txt b/toolchain/Toolchain.txt
index 9158b3f9..6e2b62f8 100644
--- a/toolchain/Toolchain.txt
+++ b/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)
diff --git a/toolchain/meson-cross-file.in b/toolchain/meson-cross-file.in
index 3a06a7bc..fd6af8c3 100644
--- a/toolchain/meson-cross-file.in
+++ b/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'