diff options
| author | Michael Forney <mforney@mforney.org> | 2017-12-14 21:20:36 -0800 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2017-12-14 21:21:54 -0800 |
| commit | b016650a305a38a6ba1d99df22bbae383e714a3d (patch) | |
| tree | b0779240e3b0c11ed584b378bd2b1c7a1df7f397 /pkg | |
| parent | a7a39db9f366a1d5e2b4b4cad20d52ecd7b65b9b (diff) | |
loksh: Update to 6.2
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/loksh/gen.lua | 10 | ||||
| -rw-r--r-- | pkg/loksh/rev | 2 | ||||
| m--------- | pkg/loksh/src | 0 | ||||
| -rw-r--r-- | pkg/openbsd/gen.lua | 2 | ||||
| -rw-r--r-- | pkg/openbsd/include/sys/time.h | 9 |
5 files changed, 17 insertions, 6 deletions
diff --git a/pkg/loksh/gen.lua b/pkg/loksh/gen.lua index 90c57458..9d7d2de6 100644 --- a/pkg/loksh/gen.lua +++ b/pkg/loksh/gen.lua @@ -1,10 +1,11 @@ cflags{ '-D _GNU_SOURCE', - '-I include', - '-idirafter pkg/openbsd/src/sys', + '-D EMACS', + '-D VI', + '-I pkg/openbsd/include', + '-idirafter $srcdir', -- for vis.h } -cc('emacs.c', {'pkg/openbsd/fetch'}) exe('ksh', { 'alloc.c', 'c_ksh.c', @@ -12,7 +13,7 @@ exe('ksh', { 'c_test.c', 'c_ulimit.c', 'edit.c', - 'emacs.c.o', + 'emacs.c', 'eval.c', 'exec.c', 'expr.c', @@ -33,6 +34,7 @@ exe('ksh', { 'var.c', 'version.c', 'vi.c', + '$builddir/pkg/openbsd/libbsd.a', }) file('bin/ksh', '755', '$outdir/ksh') sym('bin/sh', 'ksh') diff --git a/pkg/loksh/rev b/pkg/loksh/rev index 7ed6ff82..1e8b3149 100644 --- a/pkg/loksh/rev +++ b/pkg/loksh/rev @@ -1 +1 @@ -5 +6 diff --git a/pkg/loksh/src b/pkg/loksh/src -Subproject a253565372e1651ddd3d6acc2ca4954ed319680 +Subproject ee6719879d6cb06fd56ee69ad65033c3ea1f216 diff --git a/pkg/openbsd/gen.lua b/pkg/openbsd/gen.lua index e0e76eeb..4104ec0e 100644 --- a/pkg/openbsd/gen.lua +++ b/pkg/openbsd/gen.lua @@ -30,7 +30,7 @@ cc('$outdir/lib/libc/crypt/arc4random.c', { lib('libbsd.a', {paths[[ lib/libc/( crypt/(arc4random.c.o arc4random_uniform.c) - gen/(fts.c getprogname.c pwcache.c readpassphrase.c setprogname.c vis.c warnc.c vwarnc.c) + gen/(fts.c getprogname.c pwcache.c readpassphrase.c setprogname.c unvis.c vis.c warnc.c vwarnc.c) net/base64.c stdlib/(freezero.c reallocarray.c recallocarray.c strtonum.c) string/(explicit_bzero.c strmode.c timingsafe_memcmp.c) diff --git a/pkg/openbsd/include/sys/time.h b/pkg/openbsd/include/sys/time.h index 98d5d3a7..f4f151fd 100644 --- a/pkg/openbsd/include/sys/time.h +++ b/pkg/openbsd/include/sys/time.h @@ -3,3 +3,12 @@ (((tsp)->tv_sec == (usp)->tv_sec) ? \ ((tsp)->tv_nsec cmp (usp)->tv_nsec) : \ ((tsp)->tv_sec cmp (usp)->tv_sec)) +#define timespecsub(tsp, usp, vsp) \ + do { \ + (vsp)->tv_sec = (tsp)->tv_sec - (usp)->tv_sec; \ + (vsp)->tv_nsec = (tsp)->tv_nsec - (usp)->tv_nsec; \ + if ((vsp)->tv_nsec < 0) { \ + (vsp)->tv_sec--; \ + (vsp)->tv_nsec += 1000000000L; \ + } \ + } while (0) |