feat: update multiple packages

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

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

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

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",
@@ -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()}",
     )
 
 

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

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:
-            shutil.rmtree(f"packages/{i}/target")
-        except Exception:
-            pass
+        targetdir = f"packages/{i}/target"
+        if not os.path.exists(targetdir):
+            continue
+        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: