fix: source_url does not support file://

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

hooks/autostrip.py

@@ -1,4 +1,5 @@
 import os
+import stat
 import subprocess
 
 from lib import common
@@ -19,4 +20,7 @@ def autostrip(composer):
             continue
         if not _is_elf(ent.path):
             continue
+        oldperm = stat.S_IMODE(os.stat(ent.path).st_mode)
+        os.chmod(ent.path, 0o777)
         subprocess.run([strip, ent.path], check=True)
+        os.chmod(ent.path, oldperm)

lib/cpp.py

@@ -1,4 +1,5 @@
 import os
+import shutil
 import subprocess
 
 from lib.common import treedir
@@ -32,11 +33,25 @@ def make(rem: list[str] = []):
     subprocess.run(["make", f"-j{os.cpu_count()}"] + rem, check=True)
 
 
-def make_install(rem: list[str] | None = None, chdir: bool = True):
+def make_install(rem: list[str] | None = None, chdir: bool = True, move: bool = True):
     default_rem = ["DESTDIR=" + os.getcwd() + "/../cpp_install"]
+    if rem is None:
+        try:
+            shutil.rmtree("../cpp_install")
+        except:
+            pass
     subprocess.run(["make", "install"] + (rem or default_rem), check=True)
     if rem is None and chdir:
         os.chdir("../cpp_install")
+    if chdir and move:
+        subprocess.run(
+            ["sh", "-c", "cp -r ./pkg/*@*/* . 2>/dev/null || true"], check=False
+        )
+        subprocess.run(
+            ["sh", "-c", "cp -r ./usr/local/* . 2>/dev/null || true"], check=False
+        )
+        subprocess.run(["sh", "-c", "cp -r ./usr/* . 2>/dev/null || true"], check=False)
+        subprocess.run(["rm", "-rf", "./pkg", "./usr"], check=False)
 
 
 def ninja(rem: list[str] = []):

lib/make.py

@@ -72,6 +72,15 @@ def link(src: str, dst: str, default: bool = True):
     ]
 
 
+def get_prefix(pkgname: str) -> str:
+    pkginfo = _pkginfo[pkgname]
+    if pkginfo.get(_key_arch_any):
+        pkgarch = "any"
+    else:
+        pkgarch = arch.get_target()
+    return f"/pkg/{pkgname}={pkginfo[_key_version]}@{pkgarch}"
+
+
 def supported_arch(s: list[str] | typing.Callable[[str], bool]):
     global _supported_arch
     if isinstance(s, list):

lib/sources.py

@@ -30,6 +30,45 @@ def download(url, output):
             last_percent = percent
 
     try:
+        if url.startswith("file://"):
+            file_path = url[7:]
+            if not os.path.exists(file_path):
+                raise Exception("File not found: " + file_path)
+
+            total_size = os.path.getsize(file_path)
+            if total_size <= 0:
+                print("Copying...")
+                with open(file_path, "rb") as src, open(output, "wb") as dst:
+                    while True:
+                        chunk = src.read(8192)
+                        if not chunk:
+                            break
+                        dst.write(chunk)
+                print("Download completed: " + output)
+                return output
+
+            sys.stdout.write("downloading... 0%")
+            sys.stdout.flush()
+
+            with open(file_path, "rb") as src, open(output, "wb") as dst:
+                downloaded = 0
+                block_size = 8192
+                while True:
+                    chunk = src.read(block_size)
+                    if not chunk:
+                        break
+                    dst.write(chunk)
+                    downloaded += len(chunk)
+                    percent = int(downloaded * 100 / total_size)
+                    report_progress(percent)
+
+            if last_percent != 100:
+                report_progress(100)
+
+            sys.stdout.write("\n")
+            print("Download completed: " + output)
+            return output
+
         req = urllib.request.Request(url, method="GET")
         req.add_header(
             "User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36"

packages/bmake/pkgbuild.py

@@ -18,7 +18,6 @@ def build():
     )
     cpp.make()
     cpp.make_install()
-    os.chmod("bin/bmake", 0o655)
 
 
 on_build(build)

packages/gnu-make/pkgbuild.py

@@ -6,7 +6,7 @@ source_url("https://ftp.gnu.org/gnu/make/make-4.4.1.tar.gz")
 
 
 def build():
-    cpp.configure(["--prefix=/"])
+    cpp.configure([f"--prefix={get_prefix('gnu-make')}"])
     cpp.make()
     cpp.make_install()
 

packages/iana-timezone/pkgbuild.py

@@ -10,7 +10,6 @@ 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)

packages/icu4c/pkgbuild.py

@@ -11,7 +11,16 @@ source_url(
 
 def build():
     os.chdir("source")
-    cpp.configure(["--enable-plugins", "--prefix=/"])
+    cpp.configure(
+        [
+            "--enable-plugins",
+            "--prefix=/",
+            f"--bindir={get_prefix('icu4c')}/bin",
+            f"--sbindir={get_prefix('icu4c')}/sbin",
+            f"--libdir={get_prefix('libicu4c')}/lib",
+            f"--includedir={get_prefix('libicu4c-dev')}/include",
+        ]
+    )
     cpp.make()
     cpp.make_install()
 

packages/libarchive/pkgbuild.py

@@ -8,7 +8,14 @@ source_url(
 
 
 def build():
-    cpp.configure(["--prefix=/"])
+    cpp.configure(
+        [
+            "--prefix=/",
+            f"--bindir={get_prefix('libarchive-tools')}/bin",
+            f"--libdir={get_prefix('libarchive')}/lib",
+            f"--includedir={get_prefix('libarchive-dev')}/include",
+        ]
+    )
     cpp.make()
     cpp.make_install()
 
@@ -27,7 +34,12 @@ dep("libzstd @same-arch")
 package("libarchive-tools")
 cpp.use_auto_pack(["bin"])
 dep("libarchive (same)")
-provide("bsdtar")
+provide("tar")
+provide("cpio")
+provide("unzip")
+link("bin/bsdtar", "/bin/tar")
+link("bin/bsdcpio", "/bin/cpio")
+link("bin/bsdunzip", "/bin/unzip")
 
 package("libarchive-dev")
 cpp.use_auto_pack(["dev"])

packages/libffi/pkgbuild.py

@@ -11,6 +11,8 @@ def build():
     cpp.configure(
         [
             "--prefix=/",
+            f"--libdir={get_prefix('libffi')}/lib",
+            f"--includedir={get_prefix('libffi-dev')}/include",
             "--enable-portable-binary",
             "--disable-multi-os-directory",
         ]

packages/mandoc/pkgbuild.py

@@ -12,8 +12,6 @@ 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)

packages/ncurses/pkgbuild.py

@@ -11,6 +11,10 @@ def build():
     cpp.configure(
         [
             "--prefix=/",
+            f"--bindir={get_prefix('ncurses-tools')}/bin",
+            f"--sbindir={get_prefix('ncurses-tools')}/sbin",
+            f"--libdir={get_prefix('libncurses')}/lib",
+            f"--includedir={get_prefix('libncurses')}/include",
             "--enable-pc-files",
             "--with-shared",
             "--with-terminfo-dirs=/share/terminfo",
@@ -33,7 +37,6 @@ def build():
     cpp.make()
     cpp.make_install()
     os.unlink("lib/terminfo")
-    os.rename("usr/lib/pkgconfig", "lib/pkgconfig")
 
 
 on_build(build)

packages/pkgconf/pkgbuild.py

@@ -10,6 +10,9 @@ def build():
     cpp.configure(
         [
             "--prefix=/",
+            f"--bindir={get_prefix('pkgconf')}/bin",
+            f"--libdir={get_prefix('libpkgconf')}/lib",
+            f"--includedir={get_prefix('libpkgconf-dev')}/include",
             f"--with-system-libdir=/lib:/lib/{arch.get_target()}",
             f"--with-system-includedir=/lib/{arch.get_target()}/include",
             f"--with-pkg-config-dir=/lib/{arch.get_target()}/pkgconfig",

packages/python/pkgbuild.py

@@ -37,10 +37,6 @@ def build():
         ]
     )
     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}"

packages/sqlite/pkgbuild.py

@@ -9,6 +9,9 @@ def build():
     cpp.configure(
         [
             "--prefix=/",
+            f"--libdir={get_prefix('libsqlite')}/lib",
+            f"--bindir={get_prefix('sqlite')}/bin",
+            f"--includedir={get_prefix('libsqlite-dev')}/include",
             "--all",
             "--with-linenoise=/pkg/linenoise-dev=2.0@any",
             "--icu-collations",

packages/xz/pkgbuild.py

@@ -8,7 +8,14 @@ source_url(
 
 
 def build():
-    cpp.configure(["--prefix=/"])
+    cpp.configure(
+        [
+            "--prefix=/",
+            f"--libdir={get_prefix('liblzma')}/lib",
+            f"--bindir={get_prefix('xz')}/bin",
+            f"--includedir={get_prefix('liblzma-dev')}/include",
+        ]
+    )
     cpp.make()
     cpp.make_install()
 

packages/zlib-ng/pkgbuild.py

@@ -11,7 +11,6 @@ def build():
     cpp.cmake(["-DZLIB_COMPAT=ON", "-DINSTALL_UTILS=ON"])
     cpp.ninja()
     cpp.ninja_install()
-    os.chdir("usr")
 
 
 on_build(build)

packages/zstd/pkgbuild.py

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