diff options
| -rw-r--r-- | internal/rosa/llvm.go | 4 | ||||
| -rw-r--r-- | internal/rosa/llvm_test.go | 2 | ||||
| -rw-r--r-- | internal/rosa/make.go | 2 | ||||
| -rw-r--r-- | internal/rosa/package/bison.az | 11 | ||||
| -rw-r--r-- | internal/rosa/package/gnu.az | 22 |
5 files changed, 13 insertions, 28 deletions
diff --git a/internal/rosa/llvm.go b/internal/rosa/llvm.go index 52e14131..9487b2d7 100644 --- a/internal/rosa/llvm.go +++ b/internal/rosa/llvm.go @@ -18,7 +18,7 @@ var ( _musl = H("musl") _bash = H("bash") - _gawk = H("gawk") + _awk = H("awk") _pythonEarly = H("python-early") _coreutils = H("coreutils") _diffutils = H("diffutils") @@ -372,7 +372,7 @@ ln -s clang++ /work/system/bin/c++ _perl, _diffutils, _bash, - _gawk, + _awk, _coreutils, _findutils, diff --git a/internal/rosa/llvm_test.go b/internal/rosa/llvm_test.go index ef81d987..0a09ff2f 100644 --- a/internal/rosa/llvm_test.go +++ b/internal/rosa/llvm_test.go @@ -8,7 +8,7 @@ import ( ) func TestLLVMInputs(t *testing.T) { - const wantInputCount = 431 + const wantInputCount = 467 _, llvm := rosa.Native().Std().MustLoad(rosa.H("llvm")) var n int diff --git a/internal/rosa/make.go b/internal/rosa/make.go index d143a137..bc237f17 100644 --- a/internal/rosa/make.go +++ b/internal/rosa/make.go @@ -56,7 +56,7 @@ func (attr *MakeHelper) extra(flag int) P { extra := P{_make} if (attr == nil || !attr.OmitDefaults) && flag&TEarly == 0 { extra = append(extra, - _gawk, + _awk, _coreutils, ) } diff --git a/internal/rosa/package/bison.az b/internal/rosa/package/bison.az index fc914c2c..4f7dd796 100644 --- a/internal/rosa/package/bison.az +++ b/internal/rosa/package/bison.az @@ -10,10 +10,15 @@ package bison { compress = gzip; }; + // awk dependency loop + toyboxEarly = true; + exec = make { check = [ "TESTSUITEFLAGS=" + jobsFlagE + "' " + skipGNUTests { tests = [ + // GNU-isms not implemented in toybox + 168, 170, 623, // clang miscompiles (SIGILL) 764, ]; @@ -22,9 +27,5 @@ package bison { ]; }; - inputs = [ - m4, - diffutils, - sed, - ]; + inputs = [ m4 ]; } diff --git a/internal/rosa/package/gnu.az b/internal/rosa/package/gnu.az index bed93354..5502fccc 100644 --- a/internal/rosa/package/gnu.az +++ b/internal/rosa/package/gnu.az @@ -12,6 +12,9 @@ package m4 { compress = bzip2; }; + // awk dependency loop + toyboxEarly = true; + writable = true; early = ` chmod +w tests/test-c32ispunct.sh && echo '#!/bin/sh' > tests/test-c32ispunct.sh @@ -220,25 +223,6 @@ test_disable '#!/bin/sh' tests/need-filename exec = make {}; } -package gawk { - description = "an implementation of awk with GNU extensions"; - website = "https://www.gnu.org/software/gawk"; - anitya = 868; - - version# = "5.4.0"; - source = remoteTar { - url = "https://ftpmirror.gnu.org/gnu/gawk/gawk-"+version+".tar.gz"; - checksum = "m0RkIolC-PI7EY5q8pcx5Y-0twlIW0Yp3wXXmV-QaHorSdf8BhZ7kW9F8iWomz0C"; - compress = gzip; - }; - - toyboxEarly = true; - exec = make { - // dependency loop - skipCheck = true; - }; -} - package grep { description = "searches input for lines containing a match to a pattern"; website = "https://www.gnu.org/software/grep"; |