feat (lib): fix cpp auto-pack symlink error

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

lib/cpp.py

@@ -83,7 +83,10 @@ def _do_auto_pack(pc: pkgcomposer.PkgComposer, srcdir: str, dstdir: str, filter)
                 pc.makedirs(os.path.dirname(f"{dstdir}/{ent.name}"))
                 pc.addfile(ent.path, f"{dstdir}/{ent.name}")
             elif ent.is_symlink() and not os.path.isabs(os.readlink(ent.path)):
-                pc.addfile(ent.path, f"{dstdir}/{ent.name}")
+                try:
+                    pc.addfile(ent.path, f"{dstdir}/{ent.name}")
+                except Exception:
+                    pass
 
 
 def _is_dev_file(ent) -> bool:
@@ -94,6 +97,8 @@ def _is_dev_file(ent) -> bool:
         or ent.name.endswith(".pc")
         or ent.name.endswith(".h")
         or ent.name.endswith(".cmake")
+        or ent.name.endswith(".inc")
+        or ("Makefile" in ent.name)
     )
 
 

packages/diffutils/pkgbuild.py

@@ -4,6 +4,8 @@ from lib.make import *
 version("0.5.0")
 source_url("https://github.com/uutils/diffutils/archive/refs/tags/v0.5.0.tar.gz")
 
+block_hook("autolink")
+
 
 def build():
     rust.build()
@@ -13,3 +15,5 @@ on_build(build)
 
 package("diffutils")
 rust.use_auto_pack(["bin"])
+link("bin/diffutils", "/bin/cmp")
+link("bin/diffutils", "/bin/diff")

packages/nghttp2/pkgbuild.py

@@ -0,0 +1,25 @@
+import os
+
+from lib import cpp
+from lib.make import *
+
+version("1.69.0")
+source_url(
+    "https://github.com/nghttp2/nghttp2/releases/download/v1.69.0/nghttp2-1.69.0.tar.gz"
+)
+
+
+def build():
+    cpp.cmake()
+    cpp.ninja()
+    cpp.ninja_install()
+    os.chdir("usr")
+
+
+on_build(build)
+
+package("libnghttp2")
+cpp.use_auto_pack(["lib"])
+
+package("libnghttp2-dev")
+cpp.use_auto_pack(["dev"])

packages/semi-libc/pkgbuild.py

@@ -1,3 +1,4 @@
+import lib.arch as arch
 from lib.cpp import *
 from lib.make import *
 
@@ -14,8 +15,13 @@ def build():
 on_build(build)
 
 
+def musl_target():
+    return arch.get_target().split("-")[0]
+
+
 package("semi-libc")
 use_auto_pack(["lib"])
+link("lib/libc.so", f"/lib/ld-musl-{musl_target()}.so.1")
 
 package("semi-libc-dev")
 use_auto_pack(["dev"])