From f0ca3a71e91bf40c78adce8ce7ae9a5314b473a7 Mon Sep 17 00:00:00 2001
From: Wildan M <willnode@wellosoft.net>
Date: Thu, 16 Apr 2026 04:43:37 +0700
Subject: [PATCH] Make ion and pkgutils dynamically linked

---
 mk/prefix.mk                      | 2 +-
 recipes/core/ion/recipe.toml      | 6 +-----
 recipes/core/pkgutils/recipe.toml | 8 ++------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/mk/prefix.mk b/mk/prefix.mk
index 16751a81..5cd2e8c5 100644
--- a/mk/prefix.mk
+++ b/mk/prefix.mk
@@ -32,7 +32,7 @@ prefix_clean:
 # Remove relibc in sysroot and all statically linked recipes
 static_clean: | $(FSTOOLS_TAG)
 	$(MAKE) c.relibc
-	$(MAKE) c.base,base-initfs,extrautils,kernel,ion,pkgutils,redoxfs
+	$(MAKE) c.base,base-initfs,extrautils,kernel,redoxfs
 	$(MAKE) c.bash,luajit,gettext,openssl1,openssl3,pcre2,sdl1,zstd,zlib,bzip2,xz
 	$(MAKE) c.expat,freetype2,libffi,libiconv,libjpeg,liborbital,libpng,libxml2,ncurses,ncursesw
 	rm -rf $(REPO_TAG)
diff --git a/recipes/core/ion/recipe.toml b/recipes/core/ion/recipe.toml
index 2ce52ca5..80c82e33 100644
--- a/recipes/core/ion/recipe.toml
+++ b/recipes/core/ion/recipe.toml
@@ -2,8 +2,4 @@
 git = "https://gitlab.redox-os.org/redox-os/ion.git"
 
 [build]
-template = "custom"
-script = """
-# Must be statically linked
-cookbook_cargo
-"""
+template = "cargo"
diff --git a/recipes/core/pkgutils/recipe.toml b/recipes/core/pkgutils/recipe.toml
index 81dae2fe..31d110db 100644
--- a/recipes/core/pkgutils/recipe.toml
+++ b/recipes/core/pkgutils/recipe.toml
@@ -2,9 +2,5 @@
 git = "https://gitlab.redox-os.org/redox-os/pkgutils.git"
 
 [build]
-template = "custom"
-script = """
-# Must be statically linked
-COOKBOOK_CARGO_PATH=pkg-cli
-cookbook_cargo
-"""
+template = "cargo"
+cargopath = "pkg-cli"