internal/rosa: remove gawk

This change fully eliminates gawk.

Signed-off-by: Ophestra <cat@gensokyo.uk>

internal/rosa/builtins.go

@@ -107,7 +107,7 @@ func skipGNUTests(tests ...int64) string {
 			buf.WriteString(strconv.Itoa(int(n - 1)))
 			buf.WriteString(" ")
 		}
-		if i == len(tests)-1 || tests[i+1] != n+1 {
+		if i == len(tests)-1 || (tests[i+1] != n+1 && tests[i+1] != n+2) {
 			buf.WriteString(strconv.Itoa(int(n + 1)))
 			buf.WriteString("-")
 		}

internal/rosa/builtins_test.go

@@ -16,6 +16,7 @@ func TestSkipGNUTests(t *testing.T) {
 	}{
 		{[]int64{764}, "1-763 765-"},
 		{[]int64{764, 0xcafe, 37, 9}, "1-8 10-36 38-763 765-51965 51967-"},
+		{[]int64{168, 170, 623, 764}, "1-167 169 171-622 624-763 765-"},
 		{[]int64{1, 2, 0xbed}, "3-3052 3054-"},
 		{[]int64{3, 4}, "1-2 5-"},
 	}

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,
 

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

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,
 		)
 	}

internal/rosa/package/awk.az

@@ -15,8 +15,10 @@ package awk {
 	chmod = true;
 
 	exec = make {
+		omitDefaults = true;
 		inPlace = true;
 		skipConfigure = true;
+		preCheck = "install -vD a.out /system/bin/awk\n";
 		install = "install -vD a.out /work/system/bin/awk";
 	};
 

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 = [
+	inputs = [ m4 ];
-		m4,
-		diffutils,
-		sed,
-	];
 }

internal/rosa/package/cairo.az

@@ -31,7 +31,7 @@ package cairo {
 	};
 
 	inputs = [
-		gawk,
+		awk,
 
 		zlib,
 		libpng,

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";
@@ -451,7 +435,7 @@ package texinfo {
 
 	runtime = [
 		perl,
-		gawk,
+		awk,
 	];
 }
 

internal/rosa/package/kernel/package.az

@@ -132,7 +132,7 @@ rm -v "/work/system/lib/modules/$(make -f /usr/src/kernel/Makefile kernelversion
 		perl,
 		bc,
 		sed,
-		gawk,
+		awk,
 		coreutils,
 		diffutils,
 		bash,

internal/rosa/package/nss.az

@@ -61,7 +61,7 @@ cp -r \
 	inputs = [
 		perl,
 		python,
-		gawk,
+		awk,
 		coreutils,
 
 		zlib,

internal/rosa/package/wayland.az

@@ -26,7 +26,7 @@ echo 'int main(){}' > tests/sanity-test.c
 	};
 
 	inputs = [
-		gawk,
+		awk,
 		diffutils,
 
 		libffi,

internal/rosa/package/x.az

@@ -720,7 +720,7 @@ package xserver {
 	};
 
 	inputs = [
-		gawk,
+		awk,
 
 		xorgproto,
 		libxtrans,
@@ -791,7 +791,7 @@ package xwayland {
 
 	inputs = [
 		bash,
-		gawk,
+		awk,
 
 		mesa,
 		libglvnd,