linux-qubasis

commit e6d746cd7aecc1fe7e2f6fd086746a8a0d4ea714
parent 638f879f128ff75a06edbfa5cedf9f9a56b334b1
Author: Jul <jul@9o.is>
Date:   Sat,  8 Nov 2025 08:25:35 -0500

remove _ninja_buffer_sync

Diffstat:
M
ninja/functions.sh
 | 
76
++++++++++++++++++----------------------------------------------------------
M
pkg/libpng/gen.sh
 | 
2
+-

2 files changed, 19 insertions(+), 59 deletions(-)
diff --git a/ninja/functions.sh b/ninja/functions.sh
@@ -65,7 +65,17 @@ build() {
     shift 2
 
     _ninja_prefix _vs $srcdir $*
-    _ninja_sync $_vs
+
+    _vss=
+    for _v in $_vs; do
+        case $_v in
+            $srcdir/*) _vss="$_vss $_v"
+        esac
+    done
+
+    if [ "$_vss" ]; then
+        _ninja_save srcs $_vss
+    fi
 
     printf 'build %s: %s %s\n' "$_v2" "$_v1" "$_vs" >> "$_ninja_writepath"
 }
@@ -247,7 +257,7 @@ fetch() {
 }
 
 subninja() {
-    _srcs="$(
+    (
         _ninja_subninja=$1
         _ninja_init "$_ninja_gendir"
 
@@ -256,10 +266,9 @@ subninja() {
 
         $1
         _ninja_complete
-    )"
+    )
 
     printf 'subninja $ninjadir/%s.ninja\n' "$_ninja_gendir-$1" >> "$_ninja_writepath"
-    _ninja_buffer_sync="$_ninja_buffer_sync $_srcs"
 }
 
 subgen() {
@@ -355,7 +364,6 @@ _ninja_initglobals() {
 
     _ninja_buffer_subgen=
     _ninja_buffer_objs=
-    _ninja_buffer_sync=
     _ninja_buffer_fetch=
     _ninja_buffer_fspec=
     _ninja_buffer_fspec_files=
@@ -388,7 +396,7 @@ _ninja_target() {
     _vs=
 
     if _ninja_target_exists $_tgt; then
-        _vs="$(command cat "$_ninja_tgtsdir/$_tgt" | xargs)"
+        _vs="$(command cat "$_ninja_tgtsdir/$_tgt" | uniq | xargs)"
     fi
 
     if [ "$_vs" ]; then
@@ -456,15 +464,6 @@ _ninja_prefix() {
     eval "$_var='$_vs'"
 }
 
-_ninja_sync() {
-    for _v in $*; do
-        case $_v in
-            $srcdir/*|$etcdir/*)
-                _ninja_buffer_sync="$_ninja_buffer_sync $_v"
-        esac
-    done
-}
-
 _ninja_fspec() {
     # path type mode uid gid src
     _ninja_buffer_fspec="$_ninja_buffer_fspec$PREFIX$1 $2 $3 ${4-0} ${5-0} ${6-}\n"
@@ -531,7 +530,7 @@ _ninja_flush_subninjas() {
     done
 
     if [ ! ${_ninja_subninja-} ] && command -v host >/dev/null 2>&1; then
-        _srcs="$(
+        (
             _ninja_subninja=host
             _ninja_init $_ninja_gendir
 
@@ -548,10 +547,9 @@ _ninja_flush_subninjas() {
 
             host
             _ninja_complete
-        )"
+        )
 
         printf 'subninja $ninjadir/%s-host.ninja\n' $_ninja_gendir >> "$_ninja_writepath"
-        _ninja_buffer_sync="$_ninja_buffer_sync $_srcs"
     fi
 }
 
@@ -685,11 +683,6 @@ _ninja_flush_build() {
 }
 
 _ninja_flush_sync() {
-    if [ ${_ninja_subninja-} ]; then
-        printf "$_ninja_buffer_sync"
-        return
-    fi
-
     _subgens=
 
     for _v in $_ninja_buffer_subgen; do
@@ -702,20 +695,6 @@ _ninja_flush_sync() {
         root)
             phony sync $_subgens
             ;;
-        tpl)
-            phony sync $outdir/_synced
-
-            for src in $_ninja_buffer_sync; do
-                copy $outdir/_sync/${src#$etcdir/} $src
-            done
-
-            if [ "$_ninja_buffer_sync" ]; then
-                _ninja_dedup _ninja_buffer_sync $_ninja_buffer_sync
-                phony "$_ninja_buffer_sync" $outdir/_synced
-            else
-                touch _synced
-            fi
-            ;;
         pkg)
             _patches=
             _fetchdir=$outdir/_fetch
@@ -729,11 +708,8 @@ _ninja_flush_sync() {
                 done
             fi
 
-            phony sync $outdir/_fetch/fetched $_patches $_subgens
-            if [ "$_ninja_buffer_sync" ]; then
-                _ninja_dedup _ninja_buffer_sync $_ninja_buffer_sync
-                phony "$_ninja_buffer_sync" $outdir/_fetch/fetched $_patches
-            fi
+            _ninja_target srcs _fetch/srcs
+            phony sync $outdir/_fetch/fetched $_patches $_subgens $tgtdir/srcs
             ;;
     esac
 }
@@ -828,22 +804,6 @@ _ninja_flush() {
     _ninja_flush_default
 }
 
-_ninja_dedup() {
-    _var=$1; shift
-    _vs=
-
-    eval "$_var=''"
-
-    for _v in $*; do
-        case "$_vs" in
-            *" $_v "* | "$_v "* | *" $_v") ;;
-            *) _vs="$_vs $_v";;
-        esac
-    done
-
-    eval "$_var='$_vs'"
-}
-
 _ninja_has() {
     _v1=$1; shift
 
diff --git a/pkg/libpng/gen.sh b/pkg/libpng/gen.sh
@@ -13,7 +13,7 @@ bind expr '-f $srcdir/scripts/options.awk out=/dev/stdout version=search'
 awk pnglibconf.c $outdir/pnglibconf.tf4 '|' scripts/options.awk
 bind expr '-f $srcdir/scripts/options.awk out=/dev/stdout'
 
-cpp pnglibconf.tf1 $outdir/pnglibconf.c '||' pkg/zlib/headers
+cpp pnglibconf.tf1 $outdir/pnglibconf.c '||' $basedir/pkg/zlib/headers
 
 awk include/pnglibconf.h $outdir/pnglibconf.tf1
 bind expr '-f $srcdir/scripts/dfn.awk out=/dev/stdout'