diff --git a/packages/file/pkgbuild.py b/packages/file/pkgbuild.py
index e72d3c5..bd9ee70 100644
--- a/packages/file/pkgbuild.py
+++ b/packages/file/pkgbuild.py
@@ -1,6 +1,6 @@
 import subprocess
 
-from lib import cpp
+from lib import arch, cpp
 from lib.make import *
 
 VERSION = "5.48"
@@ -10,6 +10,10 @@ source_git("https://github.com/file/file.git", "FILE5_48")
 
 builddep("shortcut/c")
 builddep("shortcut/autotools")
+builddep(f"libz-dev @{arch.get_target()}")
+builddep(f"libzstd-dev @{arch.get_target()}")
+builddep(f"liblzma-dev @{arch.get_target()}")
+builddep(f"libbzip2-dev @{arch.get_target()}")
 
 
 def build():
@@ -35,6 +39,10 @@ on_pack(pack_magic_db)
 package("libmagic")
 dep("semi-libc @same-arch")
 dep("file-magic-db (same-version) @any")
+dep("libz @same-arch")
+dep("libzstd @same-arch")
+dep("liblzma @same-arch")
+dep("libbzip2 @same-arch")
 cpp.use_auto_pack(["lib"])
 
 package("libmagic-dev")
diff --git a/packages/git/pkgbuild.py b/packages/git/pkgbuild.py
index 3dc11a5..8220896 100644
--- a/packages/git/pkgbuild.py
+++ b/packages/git/pkgbuild.py
@@ -8,7 +8,8 @@ source_url("https://www.kernel.org/pub/software/scm/git/git-2.55.0.tar.gz")
 
 builddep("shortcut/c")
 builddep("shortcut/autotools")
-builddep(f"libz-dev {arch.get_target()}")
+builddep(f"libintl-dev @{arch.get_target()}")
+builddep(f"libz-dev @{arch.get_target()}")
 
 
 def build():
diff --git a/packages/libffi/pkgbuild.py b/packages/libffi/pkgbuild.py
index 11a3d71..fddee80 100644
--- a/packages/libffi/pkgbuild.py
+++ b/packages/libffi/pkgbuild.py
@@ -1,4 +1,4 @@
-from lib import cpp
+from lib import arch, cpp
 from lib.make import *
 
 version("3.6.0")
@@ -8,6 +8,7 @@ source_url(
 
 builddep("shortcut/c")
 builddep("shortcut/autotools")
+builddep(f"linux-dev @{arch.get_target()}")
 
 
 def build():
diff --git a/packages/libgcc-compat/pkgbuild.py b/packages/libgcc-compat/pkgbuild.py
index 9f07397..4a1920d 100644
--- a/packages/libgcc-compat/pkgbuild.py
+++ b/packages/libgcc-compat/pkgbuild.py
@@ -8,8 +8,8 @@ version("0.1.0")
 source_url(f"file://{os.getcwd()}/empty.tar")
 
 builddep("shortcut/c")
-builddep(f"libunwind-dev {arch.get_target()}")
-builddep(f"linux-dev {arch.get_target()}")
+builddep(f"libunwind-dev @{arch.get_target()}")
+builddep(f"linux-dev @{arch.get_target()}")
 
 
 def build():
diff --git a/packages/linux/pkgbuild.py b/packages/linux/pkgbuild.py
index 84badfe..3f20c90 100644
--- a/packages/linux/pkgbuild.py
+++ b/packages/linux/pkgbuild.py
@@ -5,7 +5,7 @@ import lib.arch as arch
 import lib.cpp as cpp
 from lib.make import *
 
-upstream_version = "6.18.35"
+upstream_version = "6.18.38"
 
 version(f"{upstream_version}")
 source_url(
diff --git a/packages/llvm-project/pkgbuild.py b/packages/llvm-project/pkgbuild.py
index a9989ef..d5c9ce5 100644
--- a/packages/llvm-project/pkgbuild.py
+++ b/packages/llvm-project/pkgbuild.py
@@ -2,7 +2,7 @@ import glob
 import os
 import subprocess
 
-upstream_version = "22.1.7"
+upstream_version = "22.1.8"
 [upstream_major, upstream_minor, upstream_rev] = upstream_version.split(".")
 
 # Begin of file lists
@@ -153,9 +153,9 @@ import lib.cpp as cpp
 from lib import arch
 from lib.make import *
 
-version("22.1.7")
+version(upstream_version)
 source_url(
-    "https://github.com/llvm/llvm-project/releases/download/llvmorg-22.1.7/llvm-project-22.1.7.src.tar.xz"
+    f"https://github.com/llvm/llvm-project/releases/download/llvmorg-{upstream_version}/llvm-project-{upstream_version}.src.tar.xz"
 )
 
 
@@ -164,6 +164,7 @@ def llvm_host_triple():
 
 
 def build():
+    os.environ["CXXFLAGS"] = os.environ.get("CXXFLAGS", "") + " --rtlib=compiler-rt"
     subprocess.run(
         [
             "cmake",
@@ -380,10 +381,10 @@ use_llvm_libs_auto_pack(["libclang", "libclang-cpp"])
 
 def pack_clang(composer):
     auto_pack_bin(composer, CLANG_BINARIES)
-    composer.makedirs("lib/clang/22/lib")
+    composer.makedirs(f"lib/clang/{upstream_major}/lib")
     composer.add_dir(
-        f"lib/clang/22/lib/{llvm_host_triple()}",
-        f"lib/clang/22/lib/{llvm_host_triple()}",
+        f"lib/clang/{upstream_major}/lib/{llvm_host_triple()}",
+        f"lib/clang/{upstream_major}/lib/{llvm_host_triple()}",
     )
 
 
diff --git a/packages/llvm-project/wrapper/clang++.wrapper b/packages/llvm-project/wrapper/clang++.wrapper
index 19e3cf3..214df0f 100644
--- a/packages/llvm-project/wrapper/clang++.wrapper
+++ b/packages/llvm-project/wrapper/clang++.wrapper
@@ -5,9 +5,13 @@ ARCHITECTURE=
 
 CLANG=$(packie print package.prefix."clang (=${LLVM_VERSION}) @${ARCHITECTURE}")/bin/llvm-clang
 
-exec ${CLANG} -x c++ \
+exec ${CLANG} \
+    -Wno-unused-command-line-argument \
+    -isystem /lib/${ARCHITECTURE}/include/c++/v1 \
     -isystem /lib/${ARCHITECTURE}/include \
     -stdlib=libc++ \
     -rtlib=compiler-rt \
     -B /lib/${ARCHITECTURE} \
+    -lc++ \
+    -Wunused-command-line-argument \
     "$@"
diff --git a/packages/llvm-project/wrapper/clang.wrapper b/packages/llvm-project/wrapper/clang.wrapper
index 42d1035..a582d25 100644
--- a/packages/llvm-project/wrapper/clang.wrapper
+++ b/packages/llvm-project/wrapper/clang.wrapper
@@ -6,7 +6,9 @@ ARCHITECTURE=
 CLANG=$(packie print package.prefix."clang (=${LLVM_VERSION}) @${ARCHITECTURE}")/bin/llvm-clang
 
 exec ${CLANG} \
+    -Wno-unused-command-line-argument \
     -isystem /lib/${ARCHITECTURE}/include \
     -rtlib=compiler-rt \
     -B /lib/${ARCHITECTURE} \
+    -Wunused-command-line-argument \
     "$@"
diff --git a/packages/mksh/pkgbuild.py b/packages/mksh/pkgbuild.py
index 8a54259..8e0e248 100644
--- a/packages/mksh/pkgbuild.py
+++ b/packages/mksh/pkgbuild.py
@@ -8,7 +8,7 @@ source_url(
 )
 
 builddep("shortcut/c")
-builddep("sed")
+builddep("gnu-sed")
 
 
 def build():
diff --git a/packages/ninja/pkgbuild.py b/packages/ninja/pkgbuild.py
index 1771e06..5f02134 100644
--- a/packages/ninja/pkgbuild.py
+++ b/packages/ninja/pkgbuild.py
@@ -6,10 +6,11 @@ version("1.13.2")
 source_url("https://github.com/ninja-build/ninja/archive/refs/tags/v1.13.2.tar.gz")
 
 builddep("shortcut/c++")
+builddep("sed")
 
 
 def build():
-    os.system("./configure.py --bootstrap")
+    os.system("python3 ./configure.py --bootstrap")
 
 
 on_build(build)
diff --git a/packages/pcre2/pkgbuild.py b/packages/pcre2/pkgbuild.py
index 348ba7b..aa9b7d0 100644
--- a/packages/pcre2/pkgbuild.py
+++ b/packages/pcre2/pkgbuild.py
@@ -6,6 +6,9 @@ source_url(
     "https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.47/pcre2-10.47.tar.gz"
 )
 
+builddep("shortcut/c")
+builddep("shortcut/autotools")
+
 
 def build():
     cpp.configure(