summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/awk/gen.rc2
-rw-r--r--core/curl/gen.rc4
-rw-r--r--core/file/gen.rc8
-rw-r--r--core/git/gen.rc8
-rw-r--r--core/iproute2/gen.rc8
-rw-r--r--core/libressl/gen.rc2
-rw-r--r--core/loksh/gen.rc5
-rw-r--r--core/mdocml/gen.rc4
-rw-r--r--core/ninja/gen.rc2
-rw-r--r--core/openbsd/gen.rc2
-rw-r--r--core/openssh/gen.rc8
-rw-r--r--core/pigz/gen.rc4
-rw-r--r--core/sbase/gen.rc10
-rw-r--r--core/ubase/gen.rc8
-rw-r--r--core/zlib/gen.rc9
-rw-r--r--desktop/expat/gen.rc1
-rw-r--r--desktop/velox/gen.rc1
-rw-r--r--devel/make/gen.rc4
-rw-r--r--extra/msmtp/gen.rc2
-rw-r--r--extra/pcsc/gen.rc1
-rw-r--r--extra/sshfs/gen.rc2
-rw-r--r--extra/the_silver_searcher/gen.rc2
-rwxr-xr-xsetup.rc4
23 files changed, 52 insertions, 49 deletions
diff --git a/core/awk/gen.rc b/core/awk/gen.rc
index a26385c3..0d87a171 100644
--- a/core/awk/gen.rc
+++ b/core/awk/gen.rc
@@ -10,7 +10,7 @@ build '$outdir'/ytab.h copy '$outdir'/gram.tab.h
} >tools.ninja ; subninja tools.ninja
rule maketab '(cd $outdir && ./maketab) >$out.tmp && mv $out.tmp $out'
-build '$outdir'/proctab.c maketab '|' '$outdir'/maketab
+build '$outdir'/proctab.c maketab '|' '$outdir'/^(maketab ytab.h)
exe awk -d '$outdir'/ytab.h\
b.c main.c parse.c tran.c lib.c run.c lex.c\
diff --git a/core/curl/gen.rc b/core/curl/gen.rc
index 854fa76b..60974d86 100644
--- a/core/curl/gen.rc
+++ b/core/curl/gen.rc
@@ -1,9 +1,9 @@
cflags\
-D HAVE_CONFIG_H\
+ -isystem '$builddir'/core/libressl/include\
+ -isystem '$builddir'/core/zlib/include\
-I include\
-I '$dir' \
- -I '$builddir'/core/libressl/include\
- -I '$builddir'/core/zlib/include\
-I '$outdir'/include/curl\
-I '$outdir'/include\
-I '$srcdir'/lib\
diff --git a/core/file/gen.rc b/core/file/gen.rc
index 706efa8a..5547d101 100644
--- a/core/file/gen.rc
+++ b/core/file/gen.rc
@@ -1,11 +1,11 @@
version=5.29
cflags\
- -DHAVE_CONFIG_H\
- -DMAGIC'='\"/share/file/magic\"\
- -D_GNU_SOURCE\
-Wall\
+ -D HAVE_CONFIG_H\
+ -D 'MAGIC=''"/share/file/magic"''' \
+ -D _GNU_SOURCE\
+ -isystem '$builddir'/core/zlib/include\
-I include\
- -I '$builddir'/core/zlib/include\
-I '$dir' \
-I '$outdir'/include
diff --git a/core/git/gen.rc b/core/git/gen.rc
index c85010e9..8cca8844 100644
--- a/core/git/gen.rc
+++ b/core/git/gen.rc
@@ -1,13 +1,13 @@
cflags\
-include '$dir'/config.h\
- -I '$builddir'/core/zlib/include\
- -I '$builddir'/core/libressl/include\
- -I '$builddir'/core/curl/include\
+ -isystem '$builddir'/core/zlib/include\
+ -isystem '$builddir'/core/libressl/include\
+ -isystem '$builddir'/core/curl/include\
-I '$srcdir' \
-I '$srcdir'/compat/regex\
-I '$outdir'
-rule cmdlist 'oldcwd=$$PWD && cd $srcdir && ./generate-cmdlist.sh $$oldcwd/$in >$$oldcwd/$out.tmp && mv $$oldcwd/$out.tmp $$oldcwd/$out'
+rule cmdlist 'wd=$$PWD && cd $srcdir && ./generate-cmdlist.sh $$wd/$in >$$wd/$out.tmp && mv $$wd/$out.tmp $$wd/$out'
build '$outdir'/common-cmds.h cmdlist '$srcdir'/command-list.txt '|' '$srcdir'/Documentation/`{grep -v '^#' commands.txt}
phony deps '$outdir'/common-cmds.h core/^(curl libressl zlib)^/headers
diff --git a/core/iproute2/gen.rc b/core/iproute2/gen.rc
index 6ac22414..2b27d2f5 100644
--- a/core/iproute2/gen.rc
+++ b/core/iproute2/gen.rc
@@ -1,8 +1,8 @@
cflags\
- -Wall -Wstrict-prototypes -Wmissing-prototypes\
- -Wmissing-declarations -Wold-style-definition -Wformat'='2\
- -D_GNU_SOURCE\
- -DHAVE_SETNS\
+ -Wall '-Wformat=2' -Wmissing-declarations -Wmissing-prototypes\
+ -Wold-style-definition -Wstrict-prototypes\
+ -D _GNU_SOURCE\
+ -D HAVE_SETNS\
-I '$srcdir'/include\
-I '$srcdir'/misc
diff --git a/core/libressl/gen.rc b/core/libressl/gen.rc
index d1fe8498..8dfc596d 100644
--- a/core/libressl/gen.rc
+++ b/core/libressl/gen.rc
@@ -3,7 +3,7 @@ cflags\
-D OPENSSL_NO_HW_PADLOCK\
-D OPENSSL_NO_ASM\
-D '''__warn_references(sym,msg)=''' \
- -I core/openbsd/include\
+ -isystem core/openbsd/include\
-I '$outdir'/include\
-I '$outdir'/internal\
-I '$srcdir'/src/lib/libcrypto\
diff --git a/core/loksh/gen.rc b/core/loksh/gen.rc
index 4a2a647b..9f8ab699 100644
--- a/core/loksh/gen.rc
+++ b/core/loksh/gen.rc
@@ -1,4 +1,7 @@
-cflags -I include -idirafter core/openbsd/src/sys -D_GNU_SOURCE
+cflags\
+ -D _GNU_SOURCE\
+ -I include\
+ -idirafter core/openbsd/src/sys
cc emacs.c '||' '$builddir'/core/openbsd/fetch.stamp
exe ksh\
diff --git a/core/mdocml/gen.rc b/core/mdocml/gen.rc
index a3a268c2..0ec06025 100644
--- a/core/mdocml/gen.rc
+++ b/core/mdocml/gen.rc
@@ -1,6 +1,6 @@
cflags\
- -I core/openbsd/include\
- -I '$builddir'/core/zlib/include\
+ -isystem core/openbsd/include\
+ -isystem '$builddir'/core/zlib/include\
-I include\
-I '$dir'
diff --git a/core/ninja/gen.rc b/core/ninja/gen.rc
index a3d49945..c4f2d321 100644
--- a/core/ninja/gen.rc
+++ b/core/ninja/gen.rc
@@ -1,7 +1,7 @@
set cc '$cxx'
set cflags '$cxxflags' \
-Wall -Wextra -Wno-deprecated -Wno-unused-parameter\
- -fno-rtti -fno-exceptions -fvisibility'='hidden\
+ -fno-rtti -fno-exceptions '-fvisibility=hidden' \
-D USE_PPOLL
exe ninja src/^(\
diff --git a/core/openbsd/gen.rc b/core/openbsd/gen.rc
index 86987910..50baaa85 100644
--- a/core/openbsd/gen.rc
+++ b/core/openbsd/gen.rc
@@ -1,7 +1,7 @@
cflags\
-D '''DEF_WEAK(n)=''' \
+ -isystem '$builddir'/core/libressl/include\
-I '$dir'/include\
- -I '$builddir'/core/libressl/include\
-idirafter '$srcdir'/include\
-idirafter '$srcdir'/sys
diff --git a/core/openssh/gen.rc b/core/openssh/gen.rc
index ba269df2..6a9ea869 100644
--- a/core/openssh/gen.rc
+++ b/core/openssh/gen.rc
@@ -1,8 +1,8 @@
cflags\
+ -isystem core/openbsd/include\
+ -isystem '$builddir'/core/libressl/include\
+ -isystem '$builddir'/core/zlib/include\
-I include\
- -I core/openbsd/include\
- -I '$builddir'/core/libressl/include\
- -I '$builddir'/core/zlib/include\
-I '$dir' \
-I '$srcdir' \
-I '$srcdir'/openbsd-compat\
@@ -79,7 +79,7 @@ file share/man/man1/ssh.1 '$srcdir'/ssh.1 644
cc sftp-server.c
cc sftp-common.c
-exe sshd\
+exe sshd -d '$dir'/deps\
sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c\
audit.c audit-bsm.c audit-linux.c platform.c\
sshpty.c sshlogin.c servconf.c serverloop.c\
diff --git a/core/pigz/gen.rc b/core/pigz/gen.rc
index a1c0bfd1..015cd2cf 100644
--- a/core/pigz/gen.rc
+++ b/core/pigz/gen.rc
@@ -1,4 +1,6 @@
-cflags -Wall -Wextra -I '$builddir'/core/zlib/include
+cflags\
+ -Wall -Wextra\
+ -isystem '$builddir'/core/zlib/include
exe pigz -d core/zlib/headers\
pigz.c yarn.c try.c\
diff --git a/core/sbase/gen.rc b/core/sbase/gen.rc
index 5bb9a916..61467dae 100644
--- a/core/sbase/gen.rc
+++ b/core/sbase/gen.rc
@@ -1,10 +1,10 @@
cflags\
- -std'='c99 -pedantic\
+ '-std=c99' -pedantic\
-Wall -Wno-maybe-uninitialized\
- -D_DEFAULT_SOURCE\
- -D_BSD_SOURCE\
- -D_XOPEN_SOURCE'='700\
- -D_FILE_OFFSET_BITS'='64\
+ -D _DEFAULT_SOURCE\
+ -D _BSD_SOURCE\
+ -D '_XOPEN_SOURCE=700' \
+ -D '_FILE_OFFSET_BITS=64' \
-I '$outdir'
lib libutil.a libutil/^(\
diff --git a/core/ubase/gen.rc b/core/ubase/gen.rc
index 0b97ce35..1d67f79c 100644
--- a/core/ubase/gen.rc
+++ b/core/ubase/gen.rc
@@ -1,9 +1,9 @@
cflags\
- -std'='c99 -pedantic\
+ '-std=c99' -pedantic\
-Wall -Wextra -Wno-maybe-uninitialized\
- -D_GNU_SOURCE\
- -D_XOPEN_SOURCE'='700\
- -D_FILE_OFFSET_BITS'='64\
+ -D _GNU_SOURCE\
+ -D '_XOPEN_SOURCE=700' \
+ -D '_FILE_OFFSET_BITS=64' \
-I '$outdir'
build '$outdir/config.h' copy '$srcdir/config.def.h'
diff --git a/core/zlib/gen.rc b/core/zlib/gen.rc
index c868a348..56ac0a0a 100644
--- a/core/zlib/gen.rc
+++ b/core/zlib/gen.rc
@@ -1,8 +1,8 @@
cflags\
- -DHAVE_HIDDEN\
- -DHAVE_STDARG_H\
- -DHAVE_UNISTD_H\
- -D_LARGEFILE64_SOURCE
+ -D HAVE_HIDDEN\
+ -D HAVE_STDARG_H\
+ -D HAVE_UNISTD_H\
+ -D _LARGEFILE64_SOURCE
lib libz.a\
adler32.c\
@@ -23,7 +23,6 @@ lib libz.a\
gzwrite.c
file lib/libz.a '$outdir'/libz.a 644
-# Only expose the headers needed to build with zlib.
hdrs=(zlib.h zconf.h)
for(hdr in $hdrs) {
build '$outdir'/include/$hdr copy '$srcdir'/$hdr
diff --git a/desktop/expat/gen.rc b/desktop/expat/gen.rc
index 5a123a91..e1bb03c8 100644
--- a/desktop/expat/gen.rc
+++ b/desktop/expat/gen.rc
@@ -2,6 +2,7 @@ cflags\
-D HAVE_EXPAT_CONFIG_H\
-I include\
-I '$dir'
+
lib libexpat.a expat/lib/^(xmlparse.c xmltok.c xmlrole.c)
hdrs=(expat.h expat_external.h)
diff --git a/desktop/velox/gen.rc b/desktop/velox/gen.rc
index 376628ac..e74c7d45 100644
--- a/desktop/velox/gen.rc
+++ b/desktop/velox/gen.rc
@@ -2,7 +2,6 @@ cflags\
-D 'VELOX_LIBEXEC=''"/libexec/velox"''' \
-isystem desktop/fontconfig/src\
-isystem desktop/libxkbcommon/src\
- -isystem desktop/swc/src/libswc\
-isystem '$builddir'/desktop/pixman/include\
-isystem '$builddir'/desktop/swc/include\
-isystem '$builddir'/desktop/wayland/include\
diff --git a/devel/make/gen.rc b/devel/make/gen.rc
index 0a4b3332..1c46aa90 100644
--- a/devel/make/gen.rc
+++ b/devel/make/gen.rc
@@ -1,9 +1,9 @@
cflags\
+ -D HAVE_CONFIG_H\
-I include\
-I '$dir' \
-I '$srcdir' \
- -I '$srcdir'/glob\
- -D HAVE_CONFIG_H
+ -I '$srcdir'/glob
lib libglob.a glob/^(glob.c fnmatch.c)
diff --git a/extra/msmtp/gen.rc b/extra/msmtp/gen.rc
index 14a7fd34..66445501 100644
--- a/extra/msmtp/gen.rc
+++ b/extra/msmtp/gen.rc
@@ -1,8 +1,8 @@
cflags\
-D HAVE_CONFIG_H\
-D 'SYSCONFDIR=\"/etc\"' \
+ -isystem '$builddir'/core/libressl/include\
-I include\
- -I '$builddir'/core/libressl/include\
-I '$dir' \
exe msmtp src/^(\
diff --git a/extra/pcsc/gen.rc b/extra/pcsc/gen.rc
index a5a6bd0d..90d33c87 100644
--- a/extra/pcsc/gen.rc
+++ b/extra/pcsc/gen.rc
@@ -1,7 +1,6 @@
version=1.8.17
cflags\
-D HAVE_CONFIG_H\
- -isystem '$builddir'/extra/libusb/include\
-I include\
-I '$dir' \
-I '$outdir' \
diff --git a/extra/sshfs/gen.rc b/extra/sshfs/gen.rc
index e10c9bfc..cdb5abf6 100644
--- a/extra/sshfs/gen.rc
+++ b/extra/sshfs/gen.rc
@@ -1,7 +1,7 @@
cflags\
-D '_FILE_OFFSET_BITS=64' \
-D 'FUSE_USE_VERSION=26' \
- -I extra/libfuse/src/include\
+ -isystem extra/libfuse/src/include\
-I '$dir'
build '$outdir'/sshfs.1 sed '$srcdir'/sshfs.1.in ; with\
diff --git a/extra/the_silver_searcher/gen.rc b/extra/the_silver_searcher/gen.rc
index 69c27504..66e447fc 100644
--- a/extra/the_silver_searcher/gen.rc
+++ b/extra/the_silver_searcher/gen.rc
@@ -1,7 +1,7 @@
cflags\
-D _GNU_SOURCE\
+ -isystem '$builddir'/extra/pcre/include\
-I include\
- -I '$builddir'/extra/pcre/include\
-I '$dir'
exe ag -d extra/pcre/headers src/^(\
diff --git a/setup.rc b/setup.rc
index ad72508b..4b2de7b7 100755
--- a/setup.rc
+++ b/setup.rc
@@ -51,8 +51,8 @@ fn gen {
. $absdir/gen.rc
- build '$dir/local.ninja' gen '|' setup.rc config.rc ninja.rc '$dir/gen.rc' $gen_inputs
- phony ninja '$dir/local.ninja' $ninja_inputs
+ build '$dir'/local.ninja gen '|' setup.rc config.rc ninja.rc '$dir'/gen.rc $gen_inputs
+ phony ninja '$dir'/local.ninja $ninja_inputs
if(! ~ $#tree_perms 0) {
printf '%s\n' $tree_perms | sort >$absdir/local.perms
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-13 01:05:28 +0000