feat: add package libtool

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",

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/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/bzip2/pkgbuild.py

@@ -20,7 +20,7 @@ def build():
         shutil.rmtree("../cpp_install")
     except Exception:
         pass
-    cpp.make_install(["PREFIX=../cpp_install" + makevars], chdir=False)
+    cpp.make_install(["PREFIX=../cpp_install"] + makevars, chdir=False)
     shutil.copy2(
         f"libbz2.so.{upstream_version}",
         f"../cpp_install/lib/libbz2.so.{upstream_version}",

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/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")

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():

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/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():

packages/libgcc-compat/pkgbuild.py

@@ -4,28 +4,16 @@ import subprocess
 from lib import arch
 from lib.make import *
 
-version("0.1.0")
+version("0.2.0")
-source_url(f"file://{os.getcwd()}/empty.tar")
+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()}")
+builddep(f"libunwind-dev @{arch.get_target()}")
-builddep(f"linux-dev {arch.get_target()}")
+builddep(f"linux-dev @{arch.get_target()}")
 
 
 def build():
-    subprocess.run(
+    subprocess.run(["./build.sh"], check=True)
-        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,
-    )
 
 
 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/libtool/pkgbuild.py

@@ -0,0 +1,48 @@
+from lib.make import *
+from lib import cpp
+
+version("2.5.4")
+source_url("https://ftpmirror.gnu.org/libtool/libtool-2.5.4.tar.gz")
+
+builddep("shortcut/c")
+builddep("shortcut/autotools")
+builddep("gnu-m4")
+
+
+def build():
+    # Build original source code
+    cpp.configure([f"--prefix={get_prefix('libtool')}"])
+    cpp.make()
+    cpp.make_install()
+
+    # Patch shell binary path
+    with open("bin/libtoolize") as file:
+        content = file.read()
+    with open("bin/libtoolize", "wt") as file:
+        file.write(content.replace("/usr/bin/env", "/bin/env"))
+
+on_build(build)
+
+
+def pack_libtool(composer):
+    composer.add_dir("bin")
+
+package("libltdl")
+dep("semi-libc @same-arch")
+cpp.use_auto_pack(["lib"])
+
+package("libltdl-dev")
+dep("semi-libc @same-arch")
+cpp.use_auto_pack(["dev"])
+
+
+def pack_libtool(composer):
+    composer.add_dir("bin", "bin")
+    composer.makedir("share")
+    composer.add_dir("share/libtool", "share/libtool")
+
+package("libtool")
+dep("semi-libc @same-arch")
+dep("mksh")
+dep("coreutils")
+on_pack(pack_libtool)

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(

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",
@@ -211,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)
@@ -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/{upstream_major}/lib/{llvm_host_triple()}",
-        f"lib/clang/22/lib/{llvm_host_triple()}",
+        f"lib/clang/{upstream_major}/lib/{llvm_host_triple()}",
     )
 
 

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

@@ -2,12 +2,18 @@
 
 LLVM_VERSION=
 ARCHITECTURE=
+LLVM_ARCH=
 
 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/${LLVM_ARCH}/c++/v1 \
     -isystem /lib/${ARCHITECTURE}/include \
     -stdlib=libc++ \
     -rtlib=compiler-rt \
     -B /lib/${ARCHITECTURE} \
+    -lc++ \
+    -Wunused-command-line-argument \
     "$@"

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 \
     "$@"

packages/mksh/pkgbuild.py

@@ -8,7 +8,7 @@ source_url(
 )
 
 builddep("shortcut/c")
-builddep("sed")
+builddep("gnu-sed")
 
 
 def build():

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)

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(

x.py

@@ -29,6 +29,7 @@ parser_build.add_argument("BUILD_PKGNAME")
 parser_clean = subparsers.add_parser("clean")
 parser_clean.add_argument("CLEAN_PKGNAME", nargs="*")
 parser_clean.add_argument("--all", action="store_true")
+parser_clean.add_argument("--no-artifacts", action="store_true")
 parser_list = subparsers.add_parser("list")
 parser_list.add_argument("ITEM", choices=("all", "built", "new"))
 parser_repo_push = subparsers.add_parser("repo-push")
@@ -132,10 +133,21 @@ def cmd_build_package(package: str):
 
 def cmd_clean_package(package: list[str]):
     for i in package:
-        try:
+        targetdir = f"packages/{i}/target"
-            shutil.rmtree(f"packages/{i}/target")
+        if not os.path.exists(targetdir):
-        except Exception:
+            continue
-            pass
+        if args.no_artifacts:
+            for file in os.listdir(targetdir):
+                path = f"{targetdir}/{file}"
+                if file.endswith(".pkg") or file == "build-ok.tag":
+                    continue
+                if os.path.isfile(path) or os.path.islink(path):
+                    os.remove(path)
+                else:
+                    shutil.rmtree(path)
+
+        else:
+            shutil.rmtree(targetdir)
 
 
 def do_list(item: str):
@@ -204,6 +216,10 @@ def cmd_build_atom(pkgname: str):
     except Exception:
         pass
 
+    # Build success
+    with open(f"{target_dir}/build-ok.tag", "wt+") as file:
+        file.write("OK")
+
 
 def cmd_repo_push(repo_dir: str, pkgname: list[str]):
     for pkg in pkgname: