feat: add package bison

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

lib/make.py

@@ -11,6 +11,7 @@ _key_on_pack = "on_pack"
 _key_arch_any = "arch_any"
 _key_links = "links"
 _key_dependencies = "dependencies"
+_key_recommendations = "recommendations"
 _key_provides = "provides"
 
 _current_pkgname: str = _key_global
@@ -19,6 +20,7 @@ _pkginfo: dict[str, dict[str, typing.Any]] = {
         _key_links: [],
         _key_dependencies: [],
         _key_provides: [],
+        _key_recommendations: [],
     },
 }
 _supported_arch: typing.Callable[[str], bool] = lambda x: True
@@ -73,12 +75,20 @@ def provide(s: str):
     ]
 
 
-def dep(s: str):
-    _pkginfo[_current_pkgname][_key_dependencies] += [
+def _translate_dep_spec(s: str) -> str:
+    return (
         s.replace("(same)", "(same-version) @same-arch")
         .replace("(same-version)", f"(={_pkginfo[_current_pkgname][_key_version]})")
         .replace("@same-arch", f"@{arch.get_target()}")
-    ]
+    )
+
+
+def dep(s: str):
+    _pkginfo[_current_pkgname][_key_dependencies] += [_translate_dep_spec(s)]
+
+
+def recommend(s: str):
+    _pkginfo[_current_pkgname][_key_recommendations] += [_translate_dep_spec(s)]
 
 
 def link(src: str, dst: str, default: bool = True):

lib/packie.py

@@ -29,3 +29,9 @@ def update():
 
 def install(requirements: list[str]):
     subprocess.run([PACKIE_EXEC, "install", "--yes"] + requirements, check=True)
+
+
+def repo_add(repo: str, pkgfile: str):
+    subprocess.run(
+        [PACKIE_EXEC, "repo-admin", repo, "--add-package", pkgfile], check=True
+    )

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

@@ -0,0 +1,23 @@
+from lib import arch, cpp
+from lib.make import *
+
+builddep("shortcut/c")
+builddep("shortcut/autotools")
+builddep(f"libncurses-dev @{arch.get_target()}")
+
+version("704")
+source_url("https://www.greenwoodsoftware.com/less/less-704.tar.gz")
+
+
+def build():
+    cpp.configure([f"--prefix={get_prefix('less')}", "--with-regex=posix"])
+    cpp.make()
+    cpp.make_install()
+
+
+on_build(build)
+
+package("less")
+dep("semi-libc @same-arch")
+dep("libncurses @same-arch")
+cpp.use_auto_pack(["bin"])

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

@@ -27,9 +27,14 @@ subparsers = argparser.add_subparsers(dest="subcommand")
 parser_build = subparsers.add_parser("build")
 parser_build.add_argument("BUILD_PKGNAME")
 parser_clean = subparsers.add_parser("clean")
-parser_clean.add_argument("CLEAN_PKGNAME")
+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")
+parser_repo_push.add_argument("REPO_DIR")
+parser_repo_push.add_argument("REPO_PUSH_PKGNAME", nargs="*")
 args = argparser.parse_args()
 
 if args.target:
@@ -50,7 +55,7 @@ def run_hooks(map, arg: typing.Any = None):
         os.chdir(current_dir)
 
 
-def run_build_package(package: str):
+def cmd_build_package(package: str):
     try:
         os.chdir(f"packages/{package}")
         os.makedirs("target", exist_ok=True)
@@ -115,6 +120,7 @@ def run_build_package(package: str):
             "arch": pkgarch,
             "dependencies": pkginfo[lib.make._key_dependencies],
             "provides": pkginfo[lib.make._key_provides],
+            "recommendations": pkginfo[lib.make._key_recommendations],
         }
         composer.write_manifest(manifest)
         composer.write_links(pkginfo[lib.make._key_links])
@@ -125,25 +131,37 @@ def run_build_package(package: str):
         file.write("OK")
 
 
-def run_clean_package(package: str):
-    try:
-        shutil.rmtree(f"packages/{package}/target")
-    except Exception:
-        pass
+def cmd_clean_package(package: list[str]):
+    for i in package:
+        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 run_list(item):
+def do_list(item: str):
     if item == "all":
         for i in os.listdir("packages"):
             if i.startswith("."):
                 continue
-            print(i)
+            yield i
     elif item == "built":
         for i in os.listdir("packages"):
             if i.startswith("."):
                 continue
             if os.path.exists(f"packages/{i}/target/build-ok.tag"):
-                print(i)
+                yield i
     elif item == "new":
         for i in os.listdir("packages"):
             if i.startswith("."):
@@ -152,12 +170,17 @@ def run_list(item):
                 pkgbuild_mtime = os.path.getmtime(f"packages/{i}/pkgbuild.py")
                 target_mtime = os.path.getmtime(f"packages/{i}/target/build-ok.tag")
                 if target_mtime < pkgbuild_mtime:
-                    print(i)
+                    yield i
             except Exception:
-                print(i)
+                yield i
 
 
-def run_build_atom(pkgname: str):
+def cmd_list(item):
+    for i in do_list(item):
+        print(i)
+
+
+def cmd_build_atom(pkgname: str):
     # Declare necessary paths
     repo_root = os.getcwd()
     package_dir = f"{repo_root}/packages/{pkgname}"
@@ -193,16 +216,41 @@ def run_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:
+        targetdir = f"packages/{pkg}/target"
+        if not os.path.exists(targetdir):
+            print(f"error: failed to add '{pkg}': package is not built")
+            continue
+        for target_file in os.listdir(targetdir):
+            if not target_file.endswith(".pkg"):
+                continue
+            try:
+                lib.packie.repo_add(repo_dir, f"{targetdir}/{target_file}")
+            except:
+                print(f"error: failed to add '{pkg}': see the output above")
+
 
 if args.subcommand == "build":
     if args.atombuild:
-        run_build_atom(args.BUILD_PKGNAME)
+        cmd_build_atom(args.BUILD_PKGNAME)
     else:
-        run_build_package(args.BUILD_PKGNAME)
+        cmd_build_package(args.BUILD_PKGNAME)
 elif args.subcommand == "clean":
-    run_clean_package(args.CLEAN_PKGNAME)
+    if args.all:
+        pkgs = os.listdir("packages")
+    else:
+        pkgs = args.CLEAN_PKGNAME
+    cmd_clean_package(pkgs)
 elif args.subcommand == "list":
-    run_list(args.ITEM)
+    cmd_list(args.ITEM)
+elif args.subcommand == "repo-push":
+    cmd_repo_push(args.REPO_DIR, args.REPO_PUSH_PKGNAME)
 else:
     print("error: no action specified", file=sys.stderr)
     exit(1)