feat: improve llvm packaging

Signed-off-by: sisungo <[email protected]>

lib/pkgcomposer.py

@@ -23,7 +23,13 @@ class PkgComposer:
 
     def write_manifest(self, manifest: dict):
         with open(self.workdir + "/PkgManifest.json", "w") as f:
-            json.dump(manifest, f, indent=4)
+            json.dump(manifest, f)
+
+    def write_links(self, links: list[dict]):
+        with open(self.workdir + "/_links", "w") as f:
+            for link in links:
+                json.dump(link, f)
+                f.write("\n")
 
     def compose(self):
         shutil.make_archive(self.pkgfile, _archive_format, self.workdir)

packages/aws-lc/patches/0001-openssldir.patch

@@ -0,0 +1,11 @@
+--- a/crypto/x509/x509_def.c
++++ b/crypto/x509/x509_def.c
+@@ -5,7 +5,7 @@
+ 
+ // TODO(fork): cleanup
+ 
+-#define OPENSSLDIR "/etc/ssl"
++#define OPENSSLDIR "/var/config/ssl"
+ 
+ #define X509_CERT_AREA OPENSSLDIR
+ #define X509_CERT_DIR OPENSSLDIR "/certs"

packages/aws-lc/pkgbuild.py

@@ -3,8 +3,8 @@ import os
 import lib.cpp as cpp
 from lib.make import *
 
-version("5.0.0")
-source_url("https://github.com/aws/aws-lc/archive/refs/tags/v5.0.0.tar.gz")
+version("5.1.0")
+source_url("https://github.com/aws/aws-lc/archive/refs/tags/v5.1.0.tar.gz")
 
 
 def build():

packages/coreutils/pkgbuild.py

@@ -7,19 +7,24 @@ block_hook("autolink")
 
 
 def build():
-    rust.build()
+    rust.build(["--features", "unix"])
 
 
 on_build(build)
 
 functions = [
     "[",
+    "arch",
     "b2sum",
     "base32",
     "base64",
     "basename",
     "basenc",
     "cat",
+    "chgrp",
+    "chmod",
+    "chown",
+    "chroot",
     "cksum",
     "comm",
     "cp",
@@ -40,21 +45,34 @@ functions = [
     "false",
     "fmt",
     "fold",
+    "groups",
     "head",
+    "hostid",
+    "hostname",
+    "id",
+    "install",
     "join",
+    "kill",
     "link",
     "ln",
+    "logname",
     "ls",
     "md5sum",
     "mkdir",
+    "mkfifo",
+    "mknod",
     "mktemp",
     "more",
     "mv",
+    "nice",
     "nl",
+    "nohup",
+    "nproc",
     "numfmt",
     "od",
     "paste",
     "pathchk",
+    "pinky",
     "pr",
     "printenv",
     "printf",
@@ -75,22 +93,32 @@ functions = [
     "sleep",
     "sort",
     "split",
+    "stat",
+    "stdbuf",
+    "stty",
     "sum",
+    "sync",
     "tac",
     "tail",
     "tee",
     "test",
+    "timeout",
     "touch",
     "tr",
     "true",
     "truncate",
     "tsort",
     "tty",
+    "uname",
     "unexpand",
     "uniq",
     "unlink",
+    "uptime",
+    "users",
     "vdir",
     "wc",
+    "who",
+    "whoami",
     "yes",
 ]
 

packages/file/pkgbuild.py

@@ -0,0 +1,43 @@
+import subprocess
+
+from lib import cpp
+from lib.make import *
+
+VERSION = "5.48"
+
+version(VERSION)
+source_git("https://github.com/file/file.git", "FILE5_48")
+
+
+def build():
+    subprocess.run(["autoreconf", "-fiv"], check=True)
+    cpp.configure(["--prefix=/", f"--datadir=/share/file"])
+    cpp.make()
+    cpp.make_install()
+
+
+on_build(build)
+
+
+def pack_magic_db(composer):
+    composer.add_dir(f"share/file", "share")
+
+
+package("file-magic-db")
+arch_any()
+link("share/misc/magic.mgc", "/share/file/misc/magic.mgc")
+on_pack(pack_magic_db)
+
+
+package("libmagic")
+dep("semi-libc @same-arch")
+dep("file-magic-db (same-version) @any")
+cpp.use_auto_pack(["lib"])
+
+package("libmagic-dev")
+dep("libmagic (same)")
+cpp.use_auto_pack(["dev"])
+
+package("file")
+dep("libmagic (same)")
+cpp.use_auto_pack(["bin"])

packages/iana-timezone/pkgbuild.py

@@ -0,0 +1,33 @@
+import os
+
+from lib import cpp
+from lib.make import *
+
+version("2026.4.22")
+source_url("https://data.iana.org/time-zones/releases/tzdb-2026b.tar.lz")
+
+
+def build():
+    cpp.make()
+    cpp.make_install()
+    os.chdir("usr")
+
+
+on_build(build)
+
+
+def pack_db(composer):
+    composer.makedir("share")
+    composer.add_dir("share/zoneinfo", "share/zoneinfo")
+
+
+package("iana-timezone-db")
+arch_any()
+on_pack(pack_db)
+
+package("iana-timezone-tools")
+dep("semi-libc @same-arch")
+cpp.use_auto_pack(["bin"])
+
+package("iana-timezone-dev")
+cpp.use_auto_pack(["dev"])

packages/kmod/pkgbuild.py

@@ -19,6 +19,8 @@ on_build(build)
 package("libkmod")
 cpp.use_auto_pack(["lib"])
 dep("semi-libc @same-arch")
+dep("libzstd @same-arch")
+dep("libcrypto @same-arch")
 
 package("kmod")
 cpp.use_auto_pack(["bin"])

packages/llvm-project/pkgbuild.py

@@ -1,6 +1,154 @@
+import glob
 import os
 import subprocess
 
+upstream_version = "22.1.7"
+[upstream_major, upstream_minor, upstream_rev] = upstream_version.split(".")
+
+# Begin of file lists
+LLVM_TOOLS = [
+    "bugpoint",
+    "dsymutil",
+    "llc",
+    "lli",
+    "llvm-addr2line",
+    "llvm-ar",
+    "llvm-as",
+    "llvm-bcanalyzer",
+    "llvm-bitcode-strip",
+    "llvm-bolt",
+    "llvm-bolt-binary-analysis",
+    "llvm-bolt-heatmap",
+    "llvm-boltdiff",
+    "llvm-c-test",
+    "llvm-cas",
+    "llvm-cat",
+    "llvm-cfi-verify",
+    "llvm-cgdata",
+    "llvm-config",
+    "llvm-cov",
+    "llvm-ctxprof-util",
+    "llvm-cvtres",
+    "llvm-cxxdump",
+    "llvm-cxxfilt",
+    "llvm-cxxmap",
+    "llvm-debuginfo-analyzer",
+    "llvm-debuginfod",
+    "llvm-debuginfod-find",
+    "llvm-diff",
+    "llvm-dis",
+    "llvm-dlltool",
+    "llvm-dwarfdump",
+    "llvm-dwarfutil",
+    "llvm-dwp",
+    "llvm-exegesis",
+    "llvm-extract",
+    "llvm-gsymutil",
+    "llvm-ifs",
+    "llvm-install-name-tool",
+    "llvm-ir2vec",
+    "llvm-jitlink",
+    "llvm-lib",
+    "llvm-libtool-darwin",
+    "llvm-link",
+    "llvm-lipo",
+    "llvm-lto",
+    "llvm-lto2",
+    "llvm-mc",
+    "llvm-mca",
+    "llvm-ml",
+    "llvm-ml64",
+    "llvm-modextract",
+    "llvm-nm",
+    "llvm-objcopy",
+    "llvm-objdump",
+    "llvm-offload-binary",
+    "llvm-offload-wrapper",
+    "llvm-opt-report",
+    "llvm-otool",
+    "llvm-pdbutil",
+    "llvm-profdata",
+    "llvm-profgen",
+    "llvm-ranlib",
+    "llvm-rc",
+    "llvm-readelf",
+    "llvm-readobj",
+    "llvm-readtapi",
+    "llvm-reduce",
+    "llvm-remarkutil",
+    "llvm-rtdyld",
+    "llvm-sim",
+    "llvm-size",
+    "llvm-split",
+    "llvm-stress",
+    "llvm-strings",
+    "llvm-strip",
+    "llvm-symbolizer",
+    "llvm-tblgen",
+    "llvm-tli-checker",
+    "llvm-undname",
+    "llvm-windres",
+    "llvm-xray",
+    "merge-fdata",
+    "opt",
+    "perf2bolt",
+    "reduce-chunk-list",
+    "sancov",
+    "sanstats",
+    "verify-uselistorder",
+]
+LLDB_BINARIES = [
+    "lldb",
+    "lldb-argdumper",
+    "lldb-dap",
+    "lldb-instr",
+    "lldb-mcp",
+    "lldb-server",
+    "yaml2macho-core",
+]
+LLD_BINARIES = ["lld", "lld-link", "ld64.lld", "wasm-ld", "wrapper://ld.lld~ld.lld"]
+CLANG_BINARIES = [
+    f"clang-{upstream_major}~llvm-clang",
+    "wrapper://clang~clang",
+    "wrapper://clang++~clang++",
+    f"wrapper://clang~clang-{upstream_major}",
+    "clang-check",
+    "clang-cl",
+    "clang-cpp",
+    "clang-extdef-mapping",
+    "clang-format",
+    "clang-installapi",
+    "clang-linker-wrapper",
+    "clang-nvlink-wrapper",
+    "clang-offload-bundler",
+    "clang-offload-packager",
+    "clang-refactor",
+    "clang-repl",
+    "clang-scan-deps",
+    "clang-sycl-linker",
+    "clang-tblgen",
+    "diagtool",
+    "git-clang-format",
+    "hmaptool",
+    "intercept-build",
+    "amdgpu-arch",
+    "c-index-test",
+    "analyze-build",
+    "nvptx-arch",
+    "offload-arch",
+    "scan-build",
+    "scan-build-py",
+    "scan-view",
+    "libexec/analyze-c++",
+    "libexec/analyze-cc",
+    "libexec/c++-analyzer",
+    "libexec/ccc-analyzer",
+    "libexec/intercept-c++",
+    "libexec/intercept-cc",
+]
+# End of file lists
+
+
 import lib.cpp as cpp
 from lib import arch
 from lib.make import *
@@ -37,6 +185,7 @@ def build():
             "-DLLVM_BUILD_LLVM_DYLIB=ON",
             "-DLLVM_ENABLE_LIBCXX=ON",
             "-DLLVM_ENABLE_LIBEDIT=ON",
+            "-DLLVM_ENABLE_LLD=ON",
             "-DLLVM_LINK_LLVM_DYLIB=ON",
             "-DLIBCXX_HAS_MUSL_LIBC=ON",
             "-DCOMPILER_RT_BUILD_GWP_ASAN=OFF",
@@ -52,315 +201,194 @@ def build():
 on_build(build)
 
 
-def pack_runtime_lib(composer, files):
-    composer.makedir("lib")
-    for file in files:
-        composer.addfile(f"lib/{llvm_host_triple()}/{file}", f"lib/{file}")
+# Begin of helper functions
+package_dir = os.getcwd()
 
 
-def pack_runtime_dev(composer, files: list[str]):
-    for file in files:
-        if file.startswith("lib/"):
-            composer.makedirs("lib")
-            composer.addfile(file.replace("lib/", f"lib/{llvm_host_triple()}/"), file)
-        elif file.startswith("include/"):
-            realpath = file.replace("include/", "usr/include/")
-            composer.makedirs(os.path.dirname(file))
-            if os.path.isfile(realpath):
-                composer.addfile(realpath, file)
-            elif os.path.isdir(realpath):
-                composer.add_dir(realpath, file)
+def install_wrapper(composer, name: str, dst: str):
+    composer.addfile(f"{package_dir}/wrapper/{name}.wrapper", dst)
+    with open(f"{composer.workdir}/bundle/{dst}", "r") as f:
+        s = f.read()
+    s = s.replace("LLVM_VERSION=", f"LLVM_VERSION={upstream_version}").replace(
+        "ARCHITECTURE=", "ARCHITECTURE=" + arch.get_target()
+    )
+    with open(f"{composer.workdir}/bundle/{dst}", "w") as f:
+        f.write(s)
+    os.chmod(f"{composer.workdir}/bundle/{dst}", 0o755)
 
 
+def auto_pack_llvm_runtime(composer, prefix, dev):
+    composer.makedirs("lib")
+    parent_dir = f"./lib/{llvm_host_triple()}"
+    for i in os.listdir(parent_dir):
+        fullpath = f"{parent_dir}/{i}"
+        if i.split(".")[0] != prefix:
+            continue
+        if dev:
+            if ".so" in i:
+                continue
+        else:
+            if not ".so" in i:
+                continue
+        composer.addfile(fullpath, f"lib/{i}")
+    if not dev:
+        return
+
+
+def auto_pack_llvm_runtime_dev(composer, condition):
+    composer.makedir("include")
+    parent_include = f"./usr/include"
+    for i in condition:
+        if i.startswith("lib:"):
+            auto_pack_llvm_runtime(composer, i.replace("lib:", ""), True)
+            continue
+        i = i.replace("include:", "")
+        for file in glob.glob(f"{parent_include}/{i}"):
+            name = file.replace(f"{parent_include}/", "")
+            if "/" in name:
+                composer.makedirs(f"include/{os.path.dirname(name)}")
+            if os.path.isdir(file):
+                composer.add_dir(file, f"include/{name}")
+            else:
+                composer.addfile(file, f"include/{name}")
+
+
+def use_llvm_runtime_auto_pack(prefix: str):
+    on_pack(lambda composer: auto_pack_llvm_runtime(composer, prefix, False))
+
+
+def use_llvm_runtime_dev_auto_pack(des: list[str]):
+    on_pack(lambda composer: auto_pack_llvm_runtime_dev(composer, des))
+
+
+def auto_pack_llvm_libs(composer, prefixes: list[str]):
+    composer.makedirs("lib")
+    parent_dir = f"./lib/"
+    for i in os.listdir(parent_dir):
+        fullpath = f"{parent_dir}/{i}"
+        if not i.split(".")[0] in prefixes:
+            continue
+        if not ".so" in i:
+            continue
+        composer.addfile(fullpath, f"lib/{i}")
+
+
+def use_llvm_libs_auto_pack(prefixes: list[str]):
+    on_pack(lambda composer: auto_pack_llvm_libs(composer, prefixes))
+
+
+def auto_pack_bin(composer, conditions: list[str]):
+    for i in conditions:
+        prefix = "bin"
+        if i.startswith("libexec/"):
+            i = i.replace("libexec/", "")
+            prefix = "libexec"
+        composer.makedirs(prefix)
+        src = i
+        dst = f"{prefix}/{i}"
+        if len(i.split("~")) == 2:
+            src = i.split("~")[0]
+            dst = f"bin/{i.split('~')[1]}"
+        if src.startswith("wrapper://"):
+            src = src.replace("wrapper://", "")
+            if len(i.split("~")) == 1:
+                dst = f"bin/{src}.wrapper"
+            install_wrapper(composer, src, dst)
+            continue
+        if os.path.exists(f"{prefix}/{src}"):
+            src = f"{prefix}/{src}"
+        elif os.path.exists(f"usr/{prefix}/{src}"):
+            src = f"usr/{prefix}/{src}"
+        composer.addfile(src, dst)
+
+
+def use_bin_auto_pack(conditions: list[str]):
+    on_pack(lambda composer: auto_pack_bin(composer, conditions))
+
+
+# End of helper functions
+
+# Begin of packages
+
 package("libunwind")
-on_pack(
-    lambda composer: pack_runtime_lib(
-        composer, ["libunwind.so.1.0", "libunwind.so.1", "libunwind.so"]
-    )
-)
+dep("semi-libc @same-arch")
+use_llvm_runtime_auto_pack("libunwind")
 
 package("libunwind-dev")
-on_pack(
-    lambda composer: pack_runtime_dev(
-        composer,
-        [
-            "lib/libunwind.a",
-            "include/mach-o/compact_unwind_encoding.h",
-            "include/__libunwind_config.h",
-            "include/libunwind.h",
-            "include/libunwind.modulemap",
-            "include/unwind.h",
-            "include/unwind_arm_ehabi.h",
-            "include/unwind_itanium.h",
-        ],
-    )
+dep("libunwind (same)")
+use_llvm_runtime_dev_auto_pack(
+    ["lib:libunwind", "include:mach-o", "include:*unwind*.h"]
 )
 
 package("libcxxabi")
-on_pack(
-    lambda composer: pack_runtime_lib(
-        composer, ["libc++abi.so", "libc++abi.so.1", "libc++abi.so.1.0"]
-    )
-)
+dep("libunwind (same)")
+use_llvm_runtime_auto_pack("libc++abi")
 
 package("libcxxabi-dev")
-on_pack(lambda composer: pack_runtime_dev(composer, ["lib/libc++abi.a"]))
+dep("libcxxabi (same)")
+use_llvm_runtime_dev_auto_pack(["lib:libc++abi"])
 
 
 package("libcxx")
-on_pack(
-    lambda composer: pack_runtime_lib(
-        composer, ["libc++.so", "libc++.so.1", "libc++.so.1.0"]
-    )
-)
+dep("libcxxabi (same)")
+use_llvm_runtime_auto_pack("libc++")
 
 package("libcxx-dev")
-on_pack(
-    lambda composer: pack_runtime_dev(
-        composer,
-        [
-            "lib/libc++.a",
-            "lib/libc++experimental.a",
-            "lib/libc++.modules.json",
-            f"include/{llvm_host_triple()}/c++/v1",
-            "include/c++/v1",
-        ],
-    )
-)
-
-
-def pack_libllvm(composer):
-    LIBRARIES = [
-        "libLLVM.so.22.1",
-        "libLLVM.so",
-        "libLLVM-22.so",
-        "libLTO.so",
-        "libLTO.so.22.1",
-        "libRemarks.so",
-        "libRemarks.so.22.1",
+dep("libcxx (same)")
+use_llvm_runtime_dev_auto_pack(
+    [
+        "lib:libc++",
+        "lib:libc++experimental",
+        f"include:{llvm_host_triple()}/c++/v1/__config_site",
+        "include:c++/v1",
     ]
-    composer.makedir("lib")
-    for lib in LIBRARIES:
-        composer.addfile(f"lib/{lib}", f"lib/{lib}")
+)
 
 
 package("libllvm")
-on_pack(pack_libllvm)
-
-
-def pack_llvm(composer):
-    BINARIES = [
-        "bugpoint",
-        "dsymutil",
-        "llc",
-        "lli",
-        "llvm-addr2line",
-        "llvm-ar",
-        "llvm-as",
-        "llvm-bcanalyzer",
-        "llvm-bitcode-strip",
-        "llvm-bolt",
-        "llvm-bolt-binary-analysis",
-        "llvm-bolt-heatmap",
-        "llvm-boltdiff",
-        "llvm-c-test",
-        "llvm-cas",
-        "llvm-cat",
-        "llvm-cfi-verify",
-        "llvm-cgdata",
-        "llvm-config",
-        "llvm-cov",
-        "llvm-ctxprof-util",
-        "llvm-cvtres",
-        "llvm-cxxdump",
-        "llvm-cxxfilt",
-        "llvm-cxxmap",
-        "llvm-debuginfo-analyzer",
-        "llvm-debuginfod",
-        "llvm-debuginfod-find",
-        "llvm-diff",
-        "llvm-dis",
-        "llvm-dlltool",
-        "llvm-dwarfdump",
-        "llvm-dwarfutil",
-        "llvm-dwp",
-        "llvm-exegesis",
-        "llvm-extract",
-        "llvm-gsymutil",
-        "llvm-ifs",
-        "llvm-install-name-tool",
-        "llvm-ir2vec",
-        "llvm-jitlink",
-        "llvm-lib",
-        "llvm-libtool-darwin",
-        "llvm-link",
-        "llvm-lipo",
-        "llvm-lto",
-        "llvm-lto2",
-        "llvm-mc",
-        "llvm-mca",
-        "llvm-ml",
-        "llvm-ml64",
-        "llvm-modextract",
-        "llvm-nm",
-        "llvm-objcopy",
-        "llvm-objdump",
-        "llvm-offload-binary",
-        "llvm-offload-wrapper",
-        "llvm-opt-report",
-        "llvm-otool",
-        "llvm-pdbutil",
-        "llvm-profdata",
-        "llvm-profgen",
-        "llvm-ranlib",
-        "llvm-rc",
-        "llvm-readelf",
-        "llvm-readobj",
-        "llvm-readtapi",
-        "llvm-reduce",
-        "llvm-remarkutil",
-        "llvm-rtdyld",
-        "llvm-sim",
-        "llvm-size",
-        "llvm-split",
-        "llvm-stress",
-        "llvm-strings",
-        "llvm-strip",
-        "llvm-symbolizer",
-        "llvm-tblgen",
-        "llvm-tli-checker",
-        "llvm-undname",
-        "llvm-windres",
-        "llvm-xray",
-        "merge-fdata",
-        "opt",
-        "perf2bolt",
-        "reduce-chunk-list",
-        "sancov",
-        "sanstats",
-        "verify-uselistorder",
-    ]
-    composer.makedir("bin")
-    for bin in BINARIES:
-        composer.addfile(f"usr/bin/{bin}", f"bin/{bin}")
-
+dep("libcxx @same-arch")
+use_llvm_libs_auto_pack(["libLLVM", "libLTO", "libRemarks"])
 
 package("llvm")
-on_pack(pack_llvm)
-
-
-def pack_lld(composer):
-    BINARIES = ["lld", "lld-link", "ld.lld", "ld64.lld", "wasm-ld"]
-    composer.makedir("bin")
-    for bin in BINARIES:
-        composer.addfile(f"usr/bin/{bin}", f"bin/{bin}")
+dep("libllvm (same)")
+use_bin_auto_pack(LLVM_TOOLS)
+for i in ["strip", "ar", "ranlib", "readelf", "objcopy", "objdump", "strings", "nm"]:
+    link(f"bin/llvm-{i}", f"/bin/{i}")
 
 
 package("lld")
-on_pack(pack_lld)
-
-
-def pack_liblldb(composer):
-    LIBRARIES = [
-        "liblldb.so",
-        "liblldb.so.22.1",
-        "liblldb.so.22.1.7",
-        "liblldbIntelFeatures.so",
-        "liblldbIntelFeatures.so.22.1",
-    ]
-    composer.makedir("lib")
-    for lib in LIBRARIES:
-        composer.addfile(f"lib/{lib}", f"lib/{lib}")
-
+dep("libcxx @same-arch")
+use_bin_auto_pack(LLD_BINARIES)
+link("bin/ld.lld", "/bin/ld")
 
 package("liblldb")
-on_pack(pack_liblldb)
-
-
-def pack_lldb(composer):
-    BINARIES = [
-        "lldb",
-        "lldb-argdumper",
-        "lldb-dap",
-        "lldb-instr",
-        "lldb-mcp",
-        "lldb-server",
-        "yaml2macho-core",
-    ]
-    composer.makedir("bin")
-    for bin in BINARIES:
-        composer.addfile(f"bin/{bin}", f"bin/{bin}")
+dep("libcxx @same-arch")
+use_llvm_libs_auto_pack(["liblldb", "liblldbIntelFeatures"])
 
 
 package("lldb")
-on_pack(pack_lldb)
-
-
-def pack_libclang(composer):
-    LIBRARIES = [
-        "libclang.so",
-        "libclang-cpp.so",
-        "libclang-cpp.so.22.1",
-        "libclang.so.22.1",
-        "libclang.so.22.1.7",
-    ]
-    composer.makedir("lib")
-    for lib in LIBRARIES:
-        composer.addfile(f"lib/{lib}", f"lib/{lib}")
+dep("libcxx @same-arch")
+dep("liblldb (same)")
+use_bin_auto_pack(LLDB_BINARIES)
 
 
 package("libclang")
-on_pack(pack_libclang)
+dep("libcxx @same-arch")
+dep("libllvm (same)")
+use_llvm_libs_auto_pack(["libclang", "libclang-cpp"])
 
 
 def pack_clang(composer):
-    BINARIES = [
-        "clang",
-        "clang++",
-        "clang-22",
-        "clang-check",
-        "clang-cl",
-        "clang-cpp",
-        "clang-extdef-mapping",
-        "clang-format",
-        "clang-installapi",
-        "clang-linker-wrapper",
-        "clang-nvlink-wrapper",
-        "clang-offload-bundler",
-        "clang-offload-packager",
-        "clang-refactor",
-        "clang-repl",
-        "clang-scan-deps",
-        "clang-sycl-linker",
-        "clang-tblgen",
-        "diagtool",
-        "git-clang-format",
-        "hmaptool",
-        "intercept-build",
-        "amdgpu-arch",
-        "c-index-test",
-        "analyze-build",
-        "nvptx-arch",
-        "offload-arch",
-        "scan-build",
-        "scan-build-py",
-        "scan-view",
-    ]
-    LIBEXEC = [
-        "analyze-c++",
-        "analyze-cc",
-        "c++-analyzer",
-        "ccc-analyzer",
-        "intercept-c++",
-        "intercept-cc",
-    ]
-    composer.makedir("bin")
-    for bin in BINARIES:
-        composer.addfile(f"usr/bin/{bin}", f"bin/{bin}")
-    composer.makedir("libexec")
-    for libexec in LIBEXEC:
-        composer.addfile(f"usr/libexec/{libexec}", f"libexec/{libexec}")
+    auto_pack_bin(composer, CLANG_BINARIES)
+    composer.makedirs("lib/clang/22/lib")
+    composer.add_dir(
+        f"lib/clang/22/lib/{llvm_host_triple()}",
+        f"lib/clang/22/lib/{llvm_host_triple()}",
+    )
 
 
 package("clang")
+dep("libclang (same)")
 on_pack(pack_clang)
+
+# End of packages

packages/llvm-project/wrapper/clang++.wrapper

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+LLVM_VERSION=
+ARCHITECTURE=
+
+CLANG=$(packie print package.prefix."clang (=${LLVM_VERSION}) @${ARCHITECTURE}")/bin/llvm-clang
+
+exec ${CLANG} -x c++ \
+    -isystem /lib/${ARCHITECTURE}/include \
+    -stdlib=libc++ \
+    -rtlib=compiler-rt \
+    -B /lib/${ARCHITECTURE} \
+    "$@"

packages/llvm-project/wrapper/clang.wrapper

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+LLVM_VERSION=
+ARCHITECTURE=
+
+CLANG=$(packie print package.prefix."clang (=${LLVM_VERSION}) @${ARCHITECTURE}")/bin/llvm-clang
+
+exec ${CLANG} \
+    -isystem /lib/${ARCHITECTURE}/include \
+    -rtlib=compiler-rt \
+    -B /lib/${ARCHITECTURE} \
+    "$@"

packages/llvm-project/wrapper/ld.lld.wrapper

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+LLVM_VERSION=
+ARCHITECTURE=
+
+LLD=$(packie print package.prefix."lld (=${LLVM_VERSION}) @${ARCHITECTURE}")/bin/lld
+
+exec ${LLD} -flavor gnu -L/lib/${ARCHITECTURE} "$@"

packages/mandoc/pkgbuild.py

@@ -0,0 +1,22 @@
+import os
+import subprocess
+
+from lib import cpp
+from lib.make import *
+
+version("1.14.6")
+source_url("https://mandoc.bsd.lv/snapshots/mandoc-1.14.6.tar.gz")
+
+
+def build():
+    cpp.configure()
+    cpp.make([f"CC={os.environ['CC']}"])
+    cpp.make_install()
+    os.chdir("usr/local")
+    subprocess.run(["sh", "-c", "chmod +w bin/* sbin/*"], check=True)
+
+
+on_build(build)
+
+package("mandoc")
+cpp.use_auto_pack(["bin"])

packages/mksh/pkgbuild.py

@@ -22,3 +22,4 @@ package("mksh")
 on_pack(pack_mksh)
 dep("semi-libc @same-arch")
 provide("sh")
+link("bin/mksh", "/bin/sh")

packages/ncurses/pkgbuild.py

@@ -0,0 +1,62 @@
+import os
+
+from lib import cpp
+from lib.make import *
+
+version("6.6")
+source_url("https://invisible-island.net/archives/ncurses/ncurses-6.6.tar.gz")
+
+
+def build():
+    cpp.configure(
+        [
+            "--prefix=/",
+            "--enable-pc-files",
+            "--with-shared",
+            "--with-terminfo-dirs=/share/terminfo",
+            "--enable-symlinks",
+            "--enable-sp-funcs",
+            "--enable-ext-colors",
+            "--enable-rgb-color",
+            "--enable-ext-mouse",
+            "--enable-ext-putwin",
+            "--enable-no-padding",
+            "--enable-sigwinch",
+            "--enable-tcap-names",
+            "--with-pthread",
+            "--enable-pthreads-eintr",
+            "--enable-weak-symbols",
+            "--enable-reentrant",
+            "--without-develop",
+        ]
+    )
+    cpp.make()
+    cpp.make_install()
+    os.unlink("lib/terminfo")
+    os.rename("usr/lib/pkgconfig", "lib/pkgconfig")
+
+
+on_build(build)
+
+package("libncurses")
+dep("semi-libc @same-arch")
+cpp.use_auto_pack(["lib"])
+
+package("ncurses-tools")
+dep("libncurses (same)")
+cpp.use_auto_pack(["bin"])
+
+package("libncurses-dev")
+dep("libncurses (same)")
+cpp.use_auto_pack(["dev"])
+
+
+def pack_terminfo(composer):
+    composer.makedir("share")
+    composer.add_dir("share/tabset", "share/tabset")
+    composer.add_dir("share/terminfo", "share/terminfo")
+
+
+package("ncurses-terminfo")
+arch_any()
+on_pack(pack_terminfo)

packages/nextvi/pkgbuild.py

@@ -0,0 +1,27 @@
+import os
+import subprocess
+
+from lib import cpp
+from lib.make import *
+
+version("5.3")
+source_url("https://github.com/kyx0r/nextvi/archive/refs/tags/5.3.tar.gz")
+
+
+def build():
+    os.environ["PREFIX"] = "/"
+    subprocess.run(["./cbuild.sh"])
+
+
+on_build(build)
+
+
+def pack(composer):
+    composer.makedir("bin")
+    composer.addfile("vi", "bin/vi")
+
+
+package("nextvi")
+on_pack(pack)
+dep("semi-libc @same-arch")
+provide("vi")

packages/openssh/pkgbuild.py

@@ -0,0 +1,55 @@
+from lib import cpp
+from lib.make import *
+
+version("10.3.1")
+source_url("https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-10.3p1.tar.gz")
+
+
+def build():
+    cpp.configure(
+        [
+            "--prefix=/",
+            "--sysconfdir=/var/config",
+            "--disable-etc-default-login",
+            "--with-linux-memlock-onfault",
+            "--without-shadow",
+            "--with-pam",
+            "--with-pie",
+        ]
+    )
+    cpp.make()
+    cpp.make_install()
+
+
+on_build(build)
+
+
+def pack_client(composer):
+    composer.add_dir("bin", "bin")
+    composer.makedir("libexec")
+    composer.addfile("libexec/ssh-sk-helper", "libexec/ssh-sk-helper")
+    composer.addfile("libexec/ssh-pkcs11-helper", "libexec/ssh-pkcs11-helper")
+
+
+package("openssh-client")
+dep("semi-libc @same-arch")
+dep("libcrypto @same-arch")
+dep("libz @same-arch")
+on_pack(pack_client)
+provide("ssh")
+
+
+def pack_server(composer):
+    composer.makedir("bin")
+    composer.addfile("sbin/sshd", "bin/sshd")
+    composer.makedir("libexec")
+    composer.addfile("libexec/sftp-server", "libexec/sftp-server")
+    composer.addfile("libexec/ssh-keysign", "libexec/ssh-keysign")
+    composer.addfile("libexec/sshd-auth", "libexec/sshd-auth")
+    composer.addfile("libexec/sshd-session", "libexec/sshd-session")
+
+
+package("openssh-server")
+dep("openssh-client (same)")
+dep("libpam @same-arch")
+on_pack(pack_server)

packages/python/pkgbuild.py

@@ -0,0 +1,101 @@
+import os
+import shutil
+import subprocess
+
+from lib import arch, cpp
+from lib.make import *
+
+VERSION_BASE = "3.14"
+VERSION_APPEND = "6"
+
+VERSION_FULL = f"{VERSION_BASE}.{VERSION_APPEND}"
+
+version(VERSION_FULL)
+source_url(
+    f"https://www.python.org/ftp/python/{VERSION_FULL}/Python-{VERSION_FULL}.tar.xz"
+)
+
+
+def build():
+    cpp.configure(
+        [
+            "--prefix=/",
+            f"--with-platlibdir=lib/{arch.get_target()}",
+            "--enable-shared",
+            "--enable-safety",
+            "--enable-optimizations",
+            "--enable-loadable-sqlite-extensions",
+            "--enable-ipv6",
+            "--with-lto=thin",
+            "--with-tzpath=/share/zoneinfo",
+            "--with-system-expat",
+            "--with-system-libmpdec",
+            "--with-readline=editline",
+            "--with-tail-call-interp",
+            "--without-ensurepip",
+            "--with-ssl-default-suites=openssl",
+        ]
+    )
+    cpp.make()
+    try:
+        shutil.rmtree("../cpp_install")
+    except:
+        pass
+    cpp.make_install()
+    os.rename(
+        f"lib/{arch.get_target()}/python{VERSION_BASE}", f"lib/python{VERSION_BASE}"
+    )
+    os.rmdir(f"lib/{arch.get_target()}")
+
+
+on_build(build)
+
+
+def python_config_target():
+    return arch.get_target().replace("-semios-linux", "-linux-musl")
+
+
+def pack_libpython(composer):
+    # Pack the standard library
+    pystdpath = f"{composer.workdir}/bundle/lib/python{VERSION_BASE}"
+    composer.makedir("lib")
+    composer.add_dir(f"lib/python{VERSION_BASE}", f"lib/python{VERSION_BASE}")
+    shutil.rmtree(f"{pystdpath}/test")
+    os.remove(
+        f"{pystdpath}/config-{VERSION_BASE}-{python_config_target()}/libpython{VERSION_BASE}.a"
+    )
+    os.remove(f"{pystdpath}/config-{VERSION_BASE}-{python_config_target()}/python.o")
+
+    # Pack native libraries
+    composer.addfile(
+        f"lib/libpython{VERSION_BASE}.so", f"lib/libpython{VERSION_BASE}.so"
+    )
+    composer.addfile(
+        f"lib/libpython{VERSION_BASE}.so.1.0", f"lib/libpython{VERSION_BASE}.so.1.0"
+    )
+    composer.addfile("lib/libpython3.so", "lib/libpython3.so")
+
+
+package("libpython")
+dep("semi-libc @same-arch")
+on_pack(pack_libpython)
+
+package("python")
+dep("libpython (same)")
+cpp.use_auto_pack(["bin"])
+link(f"bin/python{VERSION_BASE}", "/bin/python3")
+link(f"bin/python{VERSION_BASE}", "/bin/python")
+
+package("libpython-dev")
+dep("libpython (same)")
+cpp.use_auto_pack(["dev"])
+
+
+def pack_test(composer):
+    composer.makedirs(f"lib/python{VERSION_BASE}")
+    composer.add_dir(f"lib/python{VERSION_BASE}/test", f"lib/python{VERSION_BASE}/test")
+
+
+package("python-test")
+dep("libpython (same)")
+on_pack(pack_test)

packages/ripgrep/pkgbuild.py

@@ -0,0 +1,16 @@
+from lib import rust
+from lib.make import *
+
+version("15.1.0")
+source_url("https://github.com/BurntSushi/ripgrep/archive/refs/tags/15.1.0.tar.gz")
+
+
+def build():
+    rust.build()
+
+
+on_build(build)
+
+package("ripgrep")
+dep("semi-libc @same-arch")
+rust.use_auto_pack(["bin"])

packages/sed/pkgbuild.py

@@ -0,0 +1,16 @@
+from lib import rust
+from lib.make import *
+
+version("0.1.1")
+source_url("https://github.com/uutils/sed/releases/download/0.1.1/source.tar.gz")
+
+
+def build():
+    rust.build()
+
+
+on_build(build)
+
+package("sed")
+dep("semi-libc @same-arch")
+rust.use_auto_pack(["bin"])

packages/semi-libc/pkgbuild.py

@@ -2,9 +2,9 @@ import lib.arch as arch
 from lib.cpp import *
 from lib.make import *
 
-source_url("https://gitea.semilabs.org/semios/semi-libc/archive/v1.2.5.tar.gz")
-version("1.2.5")
 
+version("1.2.6")
+source_url("https://gitea.semilabs.org/semios/semi-libc/archive/v1.2.6.tar.gz")
 
 def build():
     configure(["--prefix=/"])

packages/zlib-ng/pkgbuild.py

@@ -18,7 +18,7 @@ on_build(build)
 
 package("libz-ng")
 cpp.use_auto_pack(["lib"])
-provide("libz")
+provide("libz@same-arch")
 dep("semi-libc @same-arch")
 
 package("zlib-ng-tools")
@@ -28,4 +28,4 @@ dep("libz-ng (same)")
 package("libz-ng-dev")
 cpp.use_auto_pack(["dev"])
 dep("libz-ng (same)")
-provide("libz-dev")
+provide("libz-dev@same-arch")

packages/zstd/pkgbuild.py

@@ -10,7 +10,7 @@ source_url(
 
 
 def build():
-    cpp.make()
+    cpp.make(["HAVE_ZLIB=0", "HAVE_LZMA=0", "HAVE_LZ4=0"])
     cpp.make_install()
     os.chdir("usr/local")
 

x.py

@@ -107,11 +107,11 @@ def run_build_package(package: str):
             "name": pkgname,
             "version": pkgver,
             "arch": pkgarch,
-            "links": pkginfo[lib.make._key_links],
             "dependencies": pkginfo[lib.make._key_dependencies],
             "provides": pkginfo[lib.make._key_provides],
         }
         composer.write_manifest(manifest)
+        composer.write_links(pkginfo[lib.make._key_links])
         composer.compose()
 
     # Build success