From e6f6ec836fe3f897b00c58cd3cf574cb6cf71c4d Mon Sep 17 00:00:00 2001
From: Wildan M <willnode@wellosoft.net>
Date: Thu, 10 Sep 2026 05:35:15 +0200
Subject: [PATCH 1/2] Fix libpng, gperf, llvm build using clang

---
 recipes/libs/libpng/recipe.toml         | 2 +-
 recipes/wip/dev/other/gperf/recipe.toml | 5 +++--
 src/cook/script.rs                      | 4 +++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/recipes/libs/libpng/recipe.toml b/recipes/libs/libpng/recipe.toml
index cd413dafd..1f3e7d656 100644
--- a/recipes/libs/libpng/recipe.toml
+++ b/recipes/libs/libpng/recipe.toml
@@ -13,5 +13,5 @@ template = "custom"
 dependencies = ["zlib"]
 script = """
 DYNAMIC_STATIC_INIT
-cookbook_configure
+cookbook_cmake
 """
diff --git a/recipes/wip/dev/other/gperf/recipe.toml b/recipes/wip/dev/other/gperf/recipe.toml
index 1de4341c0..d13b6c92d 100644
--- a/recipes/wip/dev/other/gperf/recipe.toml
+++ b/recipes/wip/dev/other/gperf/recipe.toml
@@ -1,6 +1,7 @@
 #TODO Promote
 [source]
-tar = "https://ftp.gnu.org/gnu/gperf/gperf-3.1.tar.gz"
-blake3 = "7023ada08089bb46d7c000af7a6eaded9b4cf0ec2d1018d28a1a1425a4ec5680"
+tar = "https://ftp.gnu.org/gnu/gperf/gperf-3.3.tar.gz"
+blake3 = "6ad90515e3b8ac191a8ecef4e75fbb260236f8e78078ac099d5eccc175af0782"
+
 [build]
 template = "configure"
diff --git a/src/cook/script.rs b/src/cook/script.rs
index 5a8335473..10331790f 100644
--- a/src/cook/script.rs
+++ b/src/cook/script.rs
@@ -265,6 +265,8 @@ set(CMAKE_C_COMPILER_TARGET ${target})
 set(CMAKE_CXX_COMPILER_TARGET ${target})
 set(CMAKE_ASM_COMPILER_TARGET ${target})
 EOF
+# redox clang workaround (see redoxer env)
+CXXFLAGS="${CXXFLAGS:+$CXXFLAGS }-stdlib=libstdc++"
 fi
 
 fi
@@ -283,7 +285,7 @@ EOF
     if [ "$target" = "$GNU_TARGET" ]
     then
         echo "set(CMAKE_C_FLAGS \"${CFLAGS} ${CPPFLAGS}\")" >> $file
-        echo "set(CMAKE_CXX_FLAGS \"${CFLAGS} ${CPPFLAGS}\")" >> $file
+        echo "set(CMAKE_CXX_FLAGS \"${CXXFLAGS} ${CPPFLAGS}\")" >> $file
     fi
 
     if [ -n "${CC_WRAPPER}" ]

From 8c0c200652b40368974b956f4bae24cbaed94eda Mon Sep 17 00:00:00 2001
From: Wildan M <willnode@wellosoft.net>
Date: Thu, 10 Sep 2026 13:02:02 +0700
Subject: [PATCH 2/2] Update redoxer

---
 Cargo.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index b128e1a76..1f71767f2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -918,7 +918,7 @@ dependencies = [
 [[package]]
 name = "redoxer"
 version = "0.2.63"
-source = "git+https://gitlab.redox-os.org/redox-os/redoxer.git#222c1a952172f7f900bea768ba44bb909add9809"
+source = "git+https://gitlab.redox-os.org/redox-os/redoxer.git#af96492e69e0563c9d42847ec4f5a118e8ec6544"
 dependencies = [
  "anyhow",
  "dirs",