linux-qubasis

commit a924c8552fa15bedec2869ef9024d07b7dbecc58
parent b64bb5a173cb7e2f8439f88cdf8f834f09b77e14
Author: Jul <jul@9o.is>
Date:   Tue, 26 Aug 2025 15:19:24 +0800

add fspec-sync package

Diffstat:
M
.gitmodules
 | 
8
++++++++
M
gen.sh
 | 
2
++
M
ninja/functions.sh
 | 
2
+-
A
pkg/b3sum/gen.sh
 | 
36
++++++++++++++++++++++++++++++++++++
A
pkg/b3sum/repo
 | 
1
+
A
pkg/b3sum/version
 | 
3
+++
A
pkg/fspec-sync/gen.sh
 | 
49
+++++++++++++++++++++++++++++++++++++++++++++++++
A
pkg/fspec-sync/repo
 | 
1
+
A
pkg/fspec-sync/version
 | 
3
+++

9 files changed, 104 insertions(+), 1 deletion(-)
diff --git a/.gitmodules b/.gitmodules
@@ -46,3 +46,11 @@
 	path = pkg/netbsd-curses/repo
 	url = https://github.com/oasislinux/netbsd-curses.git
 	ignore = all
+[submodule "fspec-sync"]
+	path = pkg/fspec-sync/repo
+	url = https://github.com/oasislinux/fspec-sync.git
+	ignore = all
+[submodule "b3sum"]
+	path = pkg/b3sum/repo
+	url = https://git.sr.ht/~mcf/b3sum
+	ignore = all
diff --git a/gen.sh b/gen.sh
@@ -17,6 +17,8 @@ setv ldflags $TARGET_LDFLAGS
 include $basedir/ninja/rules.ninja
 
 subgen pkg/abduco
+subgen pkg/b3sum
+subgen pkg/fspec-sync
 subgen pkg/less
 subgen pkg/mandoc
 subgen pkg/netbsd-curses
diff --git a/ninja/functions.sh b/ninja/functions.sh
@@ -340,7 +340,7 @@ _ninja_compile() {
 
     for src in $srcs; do
         case $src in
-            *.c)
+            *.[cS])
                 obj=$objdir/${src#\$srcdir/}.o
 
                 if [ "$_ninja_buffer_deps" ]; then
diff --git a/pkg/b3sum/gen.sh b/pkg/b3sum/gen.sh
@@ -0,0 +1,36 @@
+cflags -std=c99 \
+       -D WITH_ASM
+
+host() {
+    set_host_platform
+    setv outdir $outdir/host
+
+    compile blake3.c
+    compile blake3_dispatch.c
+    compile blake3_portable.c
+
+    lib libblake3.a $objdir/blake3.c.o \
+                    $objdir/blake3_dispatch.c.o \
+                    $objdir/blake3_portable.c.o
+}
+
+subninja host
+headers blake3.h
+
+if [ "$TARGET_ARCH" = "x86_64" ]; then
+    blake3_x86_64="blake3_cpuid.S \
+                  blake3_avx2_x86-64_unix.S \
+                  blake3_avx512_x86-64_unix.S \
+                  blake3_sse2_x86-64_unix.S \
+                  blake3_sse41_x86-64_unix.S"
+fi
+
+lib libblake3.a blake3.c \
+                blake3_dispatch.c \
+                blake3_portable.c \
+                ${blake3_x86_64-}
+
+exe b3sum b3sum.c \
+          $outdir/libblake3.a
+
+man b3sum.1
diff --git a/pkg/b3sum/repo b/pkg/b3sum/repo
@@ -0,0 +1 @@
+Subproject commit d995c3d31b42d09a568a0a658bcbcd3814164ca9
diff --git a/pkg/b3sum/version b/pkg/b3sum/version
@@ -0,0 +1,3 @@
+method=git
+ref=d995c3d
+rel=0
diff --git a/pkg/fspec-sync/gen.sh b/pkg/fspec-sync/gen.sh
@@ -0,0 +1,49 @@
+cflags -std=c99 \
+       -I $pkgdir/b3sum/include \
+       -Wno-maybe-uninitialized \
+       -Wno-sign-compare
+
+host() {
+    set_host_platform
+    setv outdir $outdir/host
+    cflags -I $pkgdir/b3sum/include
+    deps b3sum/headers
+
+    compile fatal.c
+    compile parse.c
+    compile reallocarray.c
+    compile fspec-hash.c
+    compile fspec-sort.c
+    compile fspec-tar.c
+
+    lib libcommon.a $objdir/fatal.c.o \
+                    $objdir/parse.c.o \
+                    $objdir/reallocarray.c.o
+
+    exe fspec-hash $objdir/fspec-hash.c.o \
+                   $outdir/libcommon.a \
+                   $pkgdir/b3sum/host/libblake3.a
+
+    exe fspec-sort $objdir/fspec-sort.c.o \
+                   $outdir/libcommon.a
+
+    exe fspec-tar $objdir/fspec-tar.c.o \
+                  $outdir/libcommon.a
+}
+
+subninja host
+deps b3sum/headers
+
+lib libcommon.a fatal.c \
+                parse.c \
+                reallocarray.c
+
+exe fspec-hash fspec-hash.c \
+               $outdir/libcommon.a \
+               $pkgdir/b3sum/libblake3.a
+
+exe fspec-sort fspec-sort.c \
+               $outdir/libcommon.a
+
+exe fspec-tar fspec-tar.c \
+              $outdir/libcommon.a
diff --git a/pkg/fspec-sync/repo b/pkg/fspec-sync/repo
@@ -0,0 +1 @@
+Subproject commit eca7ad681a8a8e1bdbfd85e234d9e495a5a79d0a
diff --git a/pkg/fspec-sync/version b/pkg/fspec-sync/version
@@ -0,0 +1,3 @@
+method=git
+ref=eca7ad6
+rel=0