feat: add package bash

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

lib/atombuild.py

@@ -15,12 +15,14 @@ BASE_REQUIREMENTS = [
     "packie",
     "patch",
     "zstd",
+    "libz-ng",
+    "liblzma",
+    "libbzip2",
     # Basic libraries
     "sqlite",
     "libgcc-compat",
     "libcxx",
     "semi-libc",
-    "libz-ng",
     # Networking
     "ca-certificates",
     "certutil",

lib/cpp.py

@@ -78,7 +78,7 @@ def meson_compile(rem: list[str] = []):
     subprocess.run(["meson", "compile", "-C", "_meson_build"] + rem, check=True)
 
 
-def meson_install(rem: list[str] | None = None, chdir: bool = True):
+def meson_install(rem: list[str] | None = None, chdir: bool = True, move: bool = True):
     default_rem = ["--destdir", f"{os.getcwd()}/../cpp_install"]
     if not rem:
         os.makedirs("../cpp_install", exist_ok=True)
@@ -87,6 +87,8 @@ def meson_install(rem: list[str] | None = None, chdir: bool = True):
     )
     if chdir:
         os.chdir("../cpp_install")
+    if chdir and move:
+        _move_install()
 
 
 def _do_auto_pack(pc: pkgcomposer.PkgComposer, srcdir: str, dstdir: str, filter):

lib/make.py

@@ -44,6 +44,10 @@ def builddep(s: str):
     elif s == "shortcut/rust":
         builddep("shortcut/c")
         _builddep += ["cargo", "rustc"]
+    elif s == "shortcut/cmake":
+        _builddep += ["cmake", "ninja"]
+    elif s == "shortcut/meson":
+        _builddep += ["meson", "ninja"]
     else:
         _builddep += [s]
 

packages/aws-lc/pkgbuild.py

@@ -8,18 +8,26 @@ source_url("https://github.com/aws/aws-lc/archive/refs/tags/v5.1.0.tar.gz")
 
 builddep("shortcut/c")
 
+def _fix_pc(name, prefix):
+    filepath = f"lib/pkgconfig/{name}.pc"
+    with open(filepath, "r") as f:
+        content = f.read()
+    new_content = content.replace("prefix=/", f"prefix={prefix}").replace("libdir=${prefix}/usr/lib", "libdir=${prefix}/lib")
+    with open(filepath, "w") as f:
+        f.write(new_content)
 
 def build():
     cpp.cmake(
         [
             "-DBUILD_SHARED_LIBS=1",
             "-DCMAKE_INSTALL_PREFIX=/",
-            f"-DCMAKE_INSTALL_INCLUDEDIR={get_prefix('aws-lc-dev')}",
+            f"-DCMAKE_INSTALL_INCLUDEDIR={get_prefix('aws-lc-dev')}/include",
         ]
     )
     cpp.ninja()
     cpp.ninja_install()
-
+    _fix_pc("libssl", get_prefix("aws-lc-libssl"))
+    _fix_pc("libcrypto", get_prefix("aws-lc-libcrypto"))
 
 on_build(build)
 

packages/bash/pkgbuild.py

@@ -0,0 +1,84 @@
+import os
+
+from lib.make import *
+from lib import cpp
+
+version("5.3")
+description("the Bourne Again SHell")
+source_url("https://ftp.gnu.org/gnu/bash/bash-5.3.tar.gz")
+
+builddep("shortcut/c")
+builddep("shortcut/autotools")
+builddep(f"libncurses-dev @{arch.get_target()}")
+
+def build():
+    cpp.configure([
+        f"--prefix={get_prefix('bash')}",
+        f"--datarootdir={get_prefix('bash-doc')}/share",
+        f"--localedir={get_prefix('bash')}/share/locale",
+        "--enable-alias",
+        "--enable-alt-array-implementation",
+        "--enable-arith-for-command",
+        "--enable-array-variables",
+        "--enable-bang-history",
+        "--enable-brace-expansion",
+        "--enable-casemod-attributes",
+        "--enable-casemod-expansions",
+        "--enable-command-timing",
+        "--enable-cond-command",
+        "--enable-cond-regexp",
+        "--enable-coprocesses",
+        "--enable-directory-stack",
+        "--enable-dparen-arithmetic",
+        "--enable-extended-glob",
+        "--enable-function-import",
+        "--enable-glob-asciiranges-default",
+        "--enable-help-builtin",
+        "--enable-history",
+        "--enable-job-control",
+        "--enable-multibyte",
+        "--enable-net-redirections",
+        "--enable-process-substitution",
+        "--enable-progcomp",
+        "--enable-prompt-string-decoding",
+        "--enable-readline",
+        "--enable-restricted",
+        "--enable-select",
+        "--enable-separate-helpfiles",
+        "--enable-single-help-strings",
+        "--enable-translatable-strings",
+        "--without-bash-malloc",
+    ])
+    cpp.make()
+    cpp.make_install()
+
+on_build(build)
+
+def pack_bash(composer):
+    composer.add_dir("bin", "bin")
+    composer.makedir("lib")
+    composer.add_dir("lib/bash", "lib/bash")
+    os.remove(f"{composer.workdir}/bundle/lib/bash/loadables.h")
+    os.remove(f"{composer.workdir}/bundle/lib/bash/Makefile.inc")
+    os.remove(f"{composer.workdir}/bundle/lib/bash/Makefile.sample")
+    composer.makedir("share")
+    composer.add_dir("share/locale", "share/locale")
+
+def pack_doc(composer):
+    composer.makedir("share")
+    composer.add_dir("share/bash", "share/bash")
+    composer.add_dir("share/doc", "share/doc")
+    composer.add_dir("share/info", "share/info")
+    composer.add_dir("share/man", "share/man")
+
+package("bash")
+dep("semi-libc @same-arch")
+dep("libncurses @same-arch")
+on_pack(pack_bash)
+
+package("bash-dev")
+dep("bash (same)")
+cpp.use_auto_pack(["dev"])
+
+package("bash-doc")
+on_pack(pack_doc)

packages/bison/pkgbuild.py

@@ -0,0 +1,36 @@
+from lib import cpp
+from lib.make import *
+
+version("3.7.91")
+source_url("https://alpha.gnu.org/gnu/bison/bison-3.7.91.tar.xz")
+
+builddep("shortcut/c")
+builddep("shortcut/autotools")
+builddep("gnu-m4")
+
+block_hook("autolink")
+
+
+def build():
+    cpp.configure(["--enable-relocatable"])
+    cpp.make()
+    cpp.make_install()
+
+
+on_build(build)
+
+
+def pack_bison(composer):
+    composer.add_dir("bin", "bin")
+    composer.add_dir("lib", "lib")
+    composer.makedir("share")
+    composer.add_dir("share/aclocal", "share/aclocal")
+    composer.add_dir("share/bison", "share/bison")
+
+
+package("bison")
+dep("semi-libc @same-arch")
+dep("gnu-m4")
+on_pack(pack_bison)
+link("bin/bison", "/bin/bison")
+link("bin/yacc", "/bin/yacc", default=False)

packages/cmake/pkgbuild.py

@@ -0,0 +1,63 @@
+import subprocess
+import os
+
+from lib import cpp, arch
+from lib.make import *
+
+upstream_version = "4.3.4"
+[upstream_major, upstream_minor, upstream_rev] = upstream_version.split(".")
+
+version(upstream_version)
+source_url(
+    "https://github.com/Kitware/CMake/releases/download/v4.3.4/cmake-4.3.4.tar.gz"
+)
+
+builddep("shortcut/c++")
+builddep("shortcut/autotools")
+builddep("shortcut/cmake")
+builddep(f"libcurl-dev @{arch.get_target()}")
+builddep(f"aws-lc-dev @{arch.get_target()}")
+builddep(f"libcurl-dev @{arch.get_target()}")
+builddep(f"libexpat-dev @{arch.get_target()}")
+builddep(f"libz-dev @{arch.get_target()}")
+builddep(f"libbzip2-dev @{arch.get_target()}")
+builddep(f"liblzma-dev @{arch.get_target()}")
+builddep(f"libzstd-dev @{arch.get_target()}")
+builddep(f"libnghttp2-dev @{arch.get_target()}")
+builddep(f"librhash-dev @{arch.get_target()}")
+builddep(f"libarchive-dev @{arch.get_target()}")
+builddep(f"linux-dev @{arch.get_target()}")
+
+
+def build():
+    os.environ["CMAKE_PREFIX_PATH"] = f"/lib/{arch.get_target()}"
+    cpp.cmake([
+        f"-DCMAKE_INSTALL_PREFIX={get_prefix('cmake')}",
+        "-DCMAKE_USE_SYSTEM_CURL=ON",
+        "-DCMAKE_USE_SYSTEM_ZLIB=ON",
+        "-DCMAKE_USE_SYSTEM_ZSTD=ON",
+        "-DCMAKE_USE_SYSTEM_LIBRHASH=ON",
+        "-DCMAKE_USE_SYSTEM_LIBARCHIVE=ON",
+        "-DCMAKE_USE_SYSTEM_LIBLZMA=ON",
+        "-DCMAKE_USE_SYSTEM_EXPAT=ON",
+        "-DCMAKE_USE_SYSTEM_BZIP2=ON",
+    ])
+    cpp.ninja()
+    cpp.ninja_install()
+
+
+on_build(build)
+
+def pack_cmake(composer):
+    composer.add_dir("bin", "bin")
+    composer.makedir("share")
+    composer.add_dir(
+        f"share/cmake-{upstream_major}.{upstream_minor}",
+        f"share/cmake-{upstream_major}.{upstream_minor}",
+    )
+
+package("cmake")
+dep("semi-libc @same-arch")
+dep("libcxx @same-arch")
+dep("libcurl @same-arch")
+on_pack(pack_cmake)

packages/curl/pkgbuild.py

@@ -0,0 +1,102 @@
+from lib import cpp, arch
+from lib.make import *
+
+version("8.21.0")
+source_url("https://curl.se/download/curl-8.21.0.tar.gz")
+
+builddep("shortcut/c")
+builddep("shortcut/autotools")
+builddep(f"libnghttp2-dev @{arch.get_target()}")
+builddep(f"libcares-dev @{arch.get_target()}")
+builddep(f"aws-lc-dev @{arch.get_target()}")
+builddep(f"libbrotli-dev @{arch.get_target()}")
+builddep(f"libz-dev @{arch.get_target()}")
+builddep(f"libzstd-dev @{arch.get_target()}")
+builddep(f"libpsl-dev @{arch.get_target()}")
+
+def build():
+    cpp.configure(
+        [
+            "--prefix=/",
+            f"--bindir={get_prefix('curl')}/bin",
+            f"--libdir={get_prefix('libcurl')}/lib",
+            f"--includedir={get_prefix('libcurl-dev')}/include",
+            "--enable-optimize",
+            "--disable-debug",
+            "--enable-warnings",
+            "--enable-symbol-hiding",
+            "--enable-ares",
+            "--enable-http",
+            "--enable-ftp",
+            "--enable-file",
+            "--enable-ipfs",
+            "--disable-ldap",
+            "--disable-ldaps",
+            "--enable-rtsp",
+            "--enable-proxy",
+            "--enable-dict",
+            "--enable-telnet",
+            "--enable-tftp",
+            "--enable-pop3",
+            "--enable-imap",
+            "--enable-smb",
+            "--enable-smtp",
+            "--enable-gopher",
+            "--enable-mqtt",
+            "--disable-init-mem-debug",
+            "--enable-manual",
+            "--enable-docs",
+            "--enable-libcurl-option",
+            "--enable-ipv6",
+            "--enable-openssl-auto-load-config",
+            "--enable-ca-native",
+            "--enable-versioned-symbols",
+            "--enable-typecheck",
+            "--enable-verbose",
+            "--disable-tls-srp",
+            "--enable-unix-sockets",
+            "--enable-cookies",
+            "--enable-socketpair",
+            "--enable-http-auth",
+            "--enable-doh",
+            "--enable-mime",
+            "--enable-bindlocal",
+            "--enable-form-api",
+            "--enable-dateparse",
+            "--enable-netrc",
+            "--enable-progress-meter",
+            "--enable-get-easy-options",
+            "--enable-alt-svc",
+            "--enable-headers-api",
+            "--enable-hsts",
+            "--enable-websockets",
+            "--with-openssl",
+            "--with-nghttp2",
+            "--without-libidn2",
+        ]
+    )
+    cpp.make()
+    cpp.make_install()
+
+
+on_build(build)
+
+package("libcurl")
+dep("semi-libc @same-arch")
+dep("libpsl @same-arch")
+dep("libz @same-arch")
+dep("libcares @same-arch")
+dep("libnghttp2 @same-arch")
+dep("libssl @same-arch")
+dep("libcrypto @same-arch")
+dep("libzstd @same-arch")
+dep("libbrotli @same-arch")
+cpp.use_auto_pack(["lib"])
+
+package("curl")
+dep("libcurl (same)")
+cpp.use_auto_pack(["bin"])
+
+package("libcurl-dev")
+dep("libcurl (same)")
+cpp.use_auto_pack(["dev"])

packages/glib/pkgbuild.py

@@ -0,0 +1,122 @@
+import shutil
+import os
+
+from lib.make import *
+from lib import cpp
+
+upstream_version = "2.89.2"
+
+version(upstream_version)
+source_url("https://download.gnome.org/sources/glib/2.89/glib-2.89.2.tar.xz")
+
+builddep("shortcut/c++")
+builddep("shortcut/meson")
+builddep("gettext")
+builddep(f"libintl-dev @{arch.get_target()}")
+builddep("pcre2-tools")
+builddep(f"libpcre2-dev @{arch.get_target()}")
+builddep(f"libffi-dev @{arch.get_target()}")
+builddep("pkgconf")
+builddep(f"libz-ng-dev @{arch.get_target()}")
+builddep("libexpat")
+
+
+def build():
+    os.environ["CFLAGS"] = os.environ.get("CFLAGS", "") + " -Wno-missing-include-dirs"
+    os.environ["CXXFLAGS"] = os.environ.get("CXXLAGS", "") + os.environ["CFLAGS"]
+    cpp.meson_setup([
+        "-Druntime_dir=/run",
+        f"-Dgio_module_dir=/lib/{arch.get_target()}/gio/modules",
+        "--prefix=/",
+        f"--bindir={get_prefix('glib-tools')}/bin",
+        f"--libdir={get_prefix('glib')}/lib",
+        f"--includedir={get_prefix('glib-dev')}/include",
+        f"--libexecdir={get_prefix('libglib')}/libexec",
+        f"--datadir={get_prefix('glib')}/share",
+    ])
+    cpp.meson_compile()
+    cpp.meson_install()
+
+on_build(build)
+
+
+def pack_libxxx(composer, prefix):
+    composer.makedirs("lib")
+    for i in os.listdir("lib"):
+        if not i.startswith(prefix):
+            continue
+        composer.addfile(f"lib/{i}", f"lib/{i}")
+
+
+def pack_libglib(composer):
+    composer.add_dir("libexec", "libexec")
+    pack_libxxx(composer, "libglib")
+
+
+package("libglib")
+dep("semi-libc @same-arch")
+dep("libpcre2 @same-arch")
+on_pack(pack_libglib)
+
+
+package("libgobject")
+dep("libglib (same)")
+dep("libffi @same-arch")
+on_pack(lambda composer: pack_libxxx(composer, "libgobject"))
+
+package("libgthread")
+dep("libglib (same)")
+dep("semi-libc @same-arch")
+on_pack(lambda composer: pack_libxxx(composer, "libgthread"))
+
+package("libgmodule")
+dep("libglib (same)")
+dep("semi-libc @same-arch")
+on_pack(lambda composer: pack_libxxx(composer, "libgmodule"))
+
+package("libgio")
+dep("libglib (same)")
+dep("libgobject (same)")
+dep("libgmodule (same)")
+dep("libz @same-arch")
+dep("semi-libc @same-arch")
+on_pack(lambda composer: pack_libxxx(composer, "libgio"))
+
+package("libgirepository")
+dep("libglib (same)")
+dep("libgobject (same)")
+dep("libgmodule (same)")
+dep("libffi @same-arch")
+dep("semi-libc @same-arch")
+on_pack(lambda composer: pack_libxxx(composer, "libgirepository"))
+
+
+def pack_glib(composer):
+    composer.makedir("lib")
+    for i in os.listdir("lib"):
+        if not i.endswith(".so"):
+            continue
+        pkgname = i.split("-")[0]
+        os.symlink(f"{get_prefix(pkgname)}/lib/{i}", f"{composer.workdir}/bundle/lib/{i}")
+    os.symlink(f"{get_prefix('glib-dev')}/lib/glib-2.0", f"{composer.workdir}/bundle/lib/glib-2.0")
+    composer.add_dir("share", "share")
+
+package("glib")
+dep("libglib (same)")
+dep("libgobject (same)")
+dep("libgthread (same)")
+dep("libgmodule (same)")
+dep("libgio (same)")
+dep("libgirepository (same)")
+on_pack(pack_glib)
+
+package("glib-tools")
+dep("glib (same)")
+cpp.use_auto_pack(["bin"])
+
+package("glib-dev")
+dep("glib (same)")
+dep("libz-dev @same-arch")
+dep("libpcre2-dev @same-arch")
+dep("libffi-dev @same-arch")
+cpp.use_auto_pack(["dev"])

packages/gnu-m4/pkgbuild.py

@@ -0,0 +1,29 @@
+import os
+
+from lib import cpp, arch
+from lib.make import *
+
+version("1.4.21")
+source_url("https://ftp.gnu.org/gnu/m4/m4-1.4.21.tar.xz")
+
+builddep("shortcut/c")
+builddep("shortcut/autotools")
+builddep(f"linux-dev @{arch.get_target()}")
+
+
+def build():
+    cpp.configure(
+        [f"--prefix={get_prefix('gnu-m4')}", "--enable-changeword", "--disable-nls"]
+    )
+    cpp.make()
+    cpp.make_install()
+    os.rename("bin/m4", "bin/gnu-m4")
+
+
+on_build(build)
+
+package("gnu-m4")
+provide("m4")
+dep("semi-libc @same-arch")
+cpp.use_auto_pack(["bin"])
+link("bin/gnu-m4", "/bin/m4")

packages/libgcc-compat/pkgbuild.py

@@ -4,8 +4,8 @@ import subprocess
 from lib import arch
 from lib.make import *
 
-version("0.1.0")
-source_url(f"file://{os.getcwd()}/empty.tar")
+version("0.2.0")
+source_url("https://gitea.semilabs.org/semios/libgcc-compat/archive/v0.2.0.tar.gz")
 
 builddep("shortcut/c")
 builddep(f"libunwind-dev @{arch.get_target()}")
@@ -13,19 +13,7 @@ builddep(f"linux-dev @{arch.get_target()}")
 
 
 def build():
-    subprocess.run(
-        os.environ.get("CC", "cc").split(" ")
-        + [
-            "-shared",
-            "-o",
-            "libgcc_s.so.1",
-            "-Wl,--no-as-needed",
-            "-lunwind",
-            "-Wl,--no-undefined",
-            "-Wl,-soname,libgcc_s.so.1",
-        ],
-        check=True,
-    )
+    subprocess.run(["./build.sh"], check=True)
 
 
 on_build(build)
@@ -34,6 +22,7 @@ on_build(build)
 def pack(composer):
     composer.makedir("lib")
     composer.addfile("libgcc_s.so.1", "lib/libgcc_s.so.1")
+    composer.addfile("libatomic.so.1", "lib/libatomic.so.1")
 
 
 package("libgcc-compat")

packages/libpsl/pkgbuild.py

@@ -0,0 +1,41 @@
+from lib import cpp, arch
+from lib.make import *
+
+version("0.22.0")
+source_url(
+    "https://github.com/rockdaboot/libpsl/releases/download/0.22.0/libpsl-0.22.0.tar.gz"
+)
+
+builddep("shortcut/c")
+builddep("shortcut/autotools")
+builddep(f"libicu4c-dev @{arch.get_target()}")
+builddep("pkgconf")
+
+def build():
+    cpp.configure(
+        [
+            "--prefix=/",
+            f"--libdir={get_prefix('libpsl')}/lib",
+            f"--includedir={get_prefix('libpsl-dev')}/include",
+            "--disable-nls",
+            "--enable-runtime=libicu",
+        ]
+    )
+    cpp.make()
+    cpp.make_install()
+
+
+on_build(build)
+
+package("libpsl")
+dep("semi-libc @same-arch")
+dep("libicu4c @same-arch")
+cpp.use_auto_pack(["lib"])
+
+package("libpsl-tools")
+dep("libpsl (same)")
+cpp.use_auto_pack(["bin"])
+
+package("libpsl-dev")
+dep("libpsl (same)")
+cpp.use_auto_pack(["dev"])

packages/llvm-project/pkgbuild.py

@@ -212,7 +212,7 @@ def install_wrapper(composer, name: str, dst: str):
         s = f.read()
     s = s.replace("LLVM_VERSION=", f"LLVM_VERSION={upstream_version}").replace(
         "ARCHITECTURE=", "ARCHITECTURE=" + arch.get_target()
-    )
+    ).replace("LLVM_ARCH=", "LLVM_ARCH=" + llvm_host_triple())
     with open(f"{composer.workdir}/bundle/{dst}", "w") as f:
         f.write(s)
     os.chmod(f"{composer.workdir}/bundle/{dst}", 0o755)

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

@@ -2,12 +2,14 @@
 
 LLVM_VERSION=
 ARCHITECTURE=
+LLVM_ARCH=
 
 CLANG=$(packie print package.prefix."clang (=${LLVM_VERSION}) @${ARCHITECTURE}")/bin/llvm-clang
 
 exec ${CLANG} \
     -Wno-unused-command-line-argument \
     -isystem /lib/${ARCHITECTURE}/include/c++/v1 \
+    -isystem /lib/${ARCHITECTURE}/include/${LLVM_ARCH}/c++/v1 \
     -isystem /lib/${ARCHITECTURE}/include \
     -stdlib=libc++ \
     -rtlib=compiler-rt \

packages/meson/pkgbuild.py

@@ -0,0 +1,30 @@
+import subprocess
+
+from lib.make import *
+
+version("1.11.2")
+source_url("https://github.com/mesonbuild/meson/releases/download/1.11.2/meson-1.11.2.tar.gz")
+
+builddep("python")
+
+
+def build():
+    subprocess.run([
+        "python3",
+        "./packaging/create_zipapp.py",
+        "--outfile",
+        "meson",
+        "--interpreter",
+        "/bin/python3"
+    ])
+
+on_build(build)
+
+def pack_meson(composer):
+    composer.makedir("bin")
+    composer.addfile("meson", "bin/meson")
+
+package("meson")
+dep("python @same-arch")
+recommend("ninja")
+on_pack(pack_meson)

packages/rhash/files/librhash.pc

@@ -0,0 +1,11 @@
+prefix=/
+exec_prefix=${prefix}
+libdir=
+includedir=
+
+Name: librhash
+Description: LibRHash shared library
+Version:
+Cflags: -I${includedir}
+Libs: -L${libdir} -lrhash
+Libs.private:

packages/rhash/pkgbuild.py

@@ -1,25 +1,43 @@
 from lib import cpp
 from lib.make import *
 
-version("1.4.6")
+import os
+
+upstream_version = "1.4.6"
+
+version(upstream_version)
 source_url("https://github.com/rhash/RHash/archive/refs/tags/v1.4.6.tar.gz")
 
 builddep("shortcut/c")
 builddep("shortcut/autotools")
 
+with open("files/librhash.pc") as f:
+    librhash_pc = f.read()
 
 def build():
+    global librhash_pc
     cpp.configure(
         [
             "--prefix=/",
             f"--bindir={get_prefix('rhash-tools')}/bin",
             f"--libdir={get_prefix('librhash')}/lib",
             "--disable-gettext",
+            "--enable-lib-static",
         ]
     )
     cpp.make()
     cpp.make_install()
 
+    os.symlink("librhash.so.1", "./lib/librhash.so")
+    os.makedirs("./lib/pkgconfig", exist_ok=True)
+    with open("./lib/pkgconfig/librhash.pc", "w+") as file:
+        librhash_pc = (librhash_pc
+            .replace("libdir=", f"libdir={get_prefix('librhash')}/lib")
+            .replace("includedir=", f"includedir={get_prefix('librhash-dev')}/include")
+            .replace("Version:", f"Version: {upstream_version}")
+        )
+        file.write(librhash_pc)
+
 
 on_build(build)