logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: 040da26992ae968b7553dc7000684bc9eba4f964
parent 85544b15d2da814e23ddd927601116c276c7ec3b
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Mon, 19 May 2025 22:54:06 +0200

pkg/utils-std: bump to 62bf9f5

Diffstat:

Apkg/utils-std/config.h9+++++++++
Mpkg/utils-std/gen.lua68++++++++++++++++++++++++++++++++++++++++++++------------------------
Mpkg/utils-std/ver2+-
3 files changed, 54 insertions(+), 25 deletions(-)

diff --git a/pkg/utils-std/config.h b/pkg/utils-std/config.h @@ -0,0 +1,9 @@ +/* Autogenerated by ./configure */ +#ifndef UTILS_STD_CONFIG_H +#define UTILS_STD_CONFIG_H +#define HAS_WORDEXP +#define HAS_SENDFILE +#define HAS_COPY_FILE_RANGE +#define HAS_GETOPT_LONG +#define HAS_SYNCFS +#endif // UTILS_STD_CONFIG_H diff --git a/pkg/utils-std/gen.lua b/pkg/utils-std/gen.lua @@ -1,21 +1,32 @@ cflags{ '-std=c99', '-Wall', '-Wwrite-strings', + '-I $srcdir/' } rule('sys_signame', '$srcdir/lib/sys_signame.sh >$out') build('sys_signame', '$outdir/lib/sys_signame.c', {'|', '$srcdir/lib/sys_signame.sh'}) +copy('$srcdir/', '$dir', {'config.h'}) + +pkg.deps = { + '$srcdir/config.h' +} + lib('lib.a', [[lib/( bytes2hex.c consent.c + datetime_parse.c + err.c fs.c + getopt_nolong.c humanize.c - iso_parse.c - mkdir.c + lib_mkdir.c mode.c + offline_realpath.c sha1.c sha256.c + sha512.c strtodur.c symbolize_mode.c tr_str.c @@ -23,6 +34,29 @@ lib('lib.a', [[lib/( user_group_parse.c )]]) +sym('bin/[', 'test') +sym('bin/chgrp', 'chown') +sym('bin/readlink', 'realpath') +sym('bin/uuencode', 'base64') + +--sub('expr.ninja', function() +-- cflags{'-D_POSIX_C_SOURCE=200809L'} +-- yacc('cmd/expr', 'cmd/expr.y') +-- exe('expr', [[ +-- $outdir/cmd/expr.tab.c +-- lib.a +-- ]]) +-- file('bin/expr', '755', '$outdir/expr') +-- man{'$srcdir/cmd/expr.1'} +--end) + +file('bin/timeout', '755', + exe('timeout', {'cmd/timeout.c', 'lib.a', + cc('$outdir/lib/sys_signame.c', {}, {cflags='-I $srcdir/lib/'}) + }) +) +man{'$srcdir/cmd/timeout.1'} + local cmds = { 'arch', 'base64', @@ -39,7 +73,9 @@ local cmds = { 'dirname', 'echo', 'env', + -- 'expr', 'false', + -- 'getconf', 'head', 'id', 'install', @@ -59,6 +95,7 @@ local cmds = { 'pathchk', 'printf', 'pwd', + -- 'readlink', 'realpath', 'renice', 'rm', @@ -66,6 +103,8 @@ local cmds = { 'seq', 'sha1sum', 'sha256sum', + 'sha512sum', + 'shuf', 'sleep', 'split', 'strings', @@ -73,6 +112,7 @@ local cmds = { 'tee', 'test', 'time', + -- 'timeout', 'touch', 'tr', 'true', @@ -81,8 +121,10 @@ local cmds = { 'uname', 'uniq', 'unlink', + -- 'uuencode', 'wc', 'which', + 'whoami', 'yes', } rule('m4', 'm4 $m4flags $in > $out') @@ -100,26 +142,4 @@ for _, cmd in ipairs(cmds) do end end -sym('bin/[', 'test') -sym('bin/chgrp', 'chown') -sym('bin/readlink', 'realpath') - -sub('expr.ninja', function() - cflags{'-D_POSIX_C_SOURCE=200809L'} - yacc('cmd/expr', 'cmd/expr.y') - exe('expr', [[ - $outdir/cmd/expr.tab.c - lib.a - ]]) - file('bin/expr', '755', '$outdir/expr') - man{'$srcdir/cmd/expr.1'} -end) - -file('bin/timeout', '755', - exe('timeout', {'cmd/timeout.c', 'lib.a', - cc('$outdir/lib/sys_signame.c', {}, {cflags='-I $srcdir/lib/'}) - }) -) -man{'$srcdir/cmd/timeout.1'} - fetch 'git' diff --git a/pkg/utils-std/ver b/pkg/utils-std/ver @@ -1 +1 @@ -644abc3 r0 +62bf9f5 r0