linux-qubasis

commit b64bb5a173cb7e2f8439f88cdf8f834f09b77e14
parent 2b583ff0caa34425f63841609fd5e95d058636e8
Author: Jul <jul@9o.is>
Date:   Mon, 25 Aug 2025 21:13:10 +0800

add ninja $pkgdir variable

Diffstat:
M
gen.sh
 | 
1
+
M
ninja/functions.sh
 | 
5
+++--
M
pkg/less/gen.sh
 | 
4
++--
M
pkg/mandoc/gen.sh
 | 
6
+++---

4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/gen.sh b/gen.sh
@@ -3,6 +3,7 @@ setv basedir .
 setv builddir $BUILDDIR
 setv outdir $builddir
 setv ninjadir $builddir/ninja
+setv pkgdir $builddir/pkg
 setv dir $basedir
 
 setv ar $TARGET_PLATFORM-ar
diff --git a/ninja/functions.sh b/ninja/functions.sh
@@ -138,8 +138,8 @@ pkg() {
     local out="${1-}"; shift
 
     while :; do
-        _ninja_prefix src '$builddir/pkg' $name/$src
-        _ninja_prefix out '$rootdir' $out
+        _ninja_prefix src $pkgdir $name/$src
+        _ninja_prefix out $rootdir $out
 
         build copy "$out" "$src"
         _ninja_build $out
@@ -287,6 +287,7 @@ _ninja_setv_init() {
     srcdir='$srcdir'
     rootdir='$rootdir'
     objdir='$outdir/o'
+    pkgdir='$pkgdir'
 }
 
 _ninja_prefix() {
diff --git a/pkg/less/gen.sh b/pkg/less/gen.sh
@@ -1,7 +1,7 @@
 cflags -std=c99 \
        -D _XOPEN_SOURCE=700 \
        -I $dir/include \
-       -I $builddir/pkg/netbsd-curses/include \
+       -I $pkgdir/netbsd-curses/include \
        -Wno-type-limits \
        -Wno-maybe-uninitialized \
        -Wno-sign-compare \
@@ -52,7 +52,7 @@ exe less brac.c \
          $objdir/lesskey_parse.c.o \
          $objdir/version.c.o \
          $objdir/xbuf.c.o \
-         $builddir/pkg/netbsd-curses/libcurses.a.d
+         $pkgdir/netbsd-curses/libcurses.a.d
 
 exe lessecho lessecho.c \
              $objdir/version.c.o
diff --git a/pkg/mandoc/gen.sh b/pkg/mandoc/gen.sh
@@ -1,5 +1,5 @@
 cflags -I $dir/include \
-       -I $builddir/pkg/zlib/include \
+       -I $pkgdir/zlib/include \
        -D MANPATH_BASE='"\"'/$MANDIR'\""' \
        -D MANPATH_DEFAULT='"\"'/$MANDIR'\""' \
        -Wno-implicit-function-declaration \
@@ -75,11 +75,11 @@ exe mandoc dba.c \
            term_tag.c \
            tree.c \
            $outdir/libmandoc.a \
-           $builddir/pkg/zlib/libz.a
+           $pkgdir/zlib/libz.a
 
 exe demandoc demandoc.c \
              $outdir/libmandoc.a \
-             $builddir/pkg/zlib/libz.a
+             $pkgdir/zlib/libz.a
 
 sym apropos mandoc
 sym man mandoc