internal/rosa: remove gawk
Test / Create distribution (push) Successful in 58s
Test / Sandbox (push) Successful in 2m55s
Test / ShareFS (push) Successful in 3m58s
Test / Hakurei (push) Successful in 4m3s
Test / Sandbox (race detector) (push) Successful in 5m34s
Test / Hakurei (race detector) (push) Successful in 6m45s
Test / Flake checks (push) Successful in 1m10s
Test / Create distribution (push) Successful in 58s
Test / Sandbox (push) Successful in 2m55s
Test / ShareFS (push) Successful in 3m58s
Test / Hakurei (push) Successful in 4m3s
Test / Sandbox (race detector) (push) Successful in 5m34s
Test / Hakurei (race detector) (push) Successful in 6m45s
Test / Flake checks (push) Successful in 1m10s
This change fully eliminates gawk. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
@@ -18,7 +18,7 @@ var (
|
|||||||
_musl = H("musl")
|
_musl = H("musl")
|
||||||
|
|
||||||
_bash = H("bash")
|
_bash = H("bash")
|
||||||
_gawk = H("gawk")
|
_awk = H("awk")
|
||||||
_pythonEarly = H("python-early")
|
_pythonEarly = H("python-early")
|
||||||
_coreutils = H("coreutils")
|
_coreutils = H("coreutils")
|
||||||
_diffutils = H("diffutils")
|
_diffutils = H("diffutils")
|
||||||
@@ -372,7 +372,7 @@ ln -s clang++ /work/system/bin/c++
|
|||||||
_perl,
|
_perl,
|
||||||
_diffutils,
|
_diffutils,
|
||||||
_bash,
|
_bash,
|
||||||
_gawk,
|
_awk,
|
||||||
_coreutils,
|
_coreutils,
|
||||||
_findutils,
|
_findutils,
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func TestLLVMInputs(t *testing.T) {
|
func TestLLVMInputs(t *testing.T) {
|
||||||
const wantInputCount = 431
|
const wantInputCount = 467
|
||||||
|
|
||||||
_, llvm := rosa.Native().Std().MustLoad(rosa.H("llvm"))
|
_, llvm := rosa.Native().Std().MustLoad(rosa.H("llvm"))
|
||||||
var n int
|
var n int
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ func (attr *MakeHelper) extra(flag int) P {
|
|||||||
extra := P{_make}
|
extra := P{_make}
|
||||||
if (attr == nil || !attr.OmitDefaults) && flag&TEarly == 0 {
|
if (attr == nil || !attr.OmitDefaults) && flag&TEarly == 0 {
|
||||||
extra = append(extra,
|
extra = append(extra,
|
||||||
_gawk,
|
_awk,
|
||||||
_coreutils,
|
_coreutils,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,10 +10,15 @@ package bison {
|
|||||||
compress = gzip;
|
compress = gzip;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// awk dependency loop
|
||||||
|
toyboxEarly = true;
|
||||||
|
|
||||||
exec = make {
|
exec = make {
|
||||||
check = [
|
check = [
|
||||||
"TESTSUITEFLAGS=" + jobsFlagE + "' " + skipGNUTests {
|
"TESTSUITEFLAGS=" + jobsFlagE + "' " + skipGNUTests {
|
||||||
tests = [
|
tests = [
|
||||||
|
// GNU-isms not implemented in toybox
|
||||||
|
168, 170, 623,
|
||||||
// clang miscompiles (SIGILL)
|
// clang miscompiles (SIGILL)
|
||||||
764,
|
764,
|
||||||
];
|
];
|
||||||
@@ -22,9 +27,5 @@ package bison {
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
inputs = [
|
inputs = [ m4 ];
|
||||||
m4,
|
|
||||||
diffutils,
|
|
||||||
sed,
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,6 +12,9 @@ package m4 {
|
|||||||
compress = bzip2;
|
compress = bzip2;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// awk dependency loop
|
||||||
|
toyboxEarly = true;
|
||||||
|
|
||||||
writable = true;
|
writable = true;
|
||||||
early = `
|
early = `
|
||||||
chmod +w tests/test-c32ispunct.sh && echo '#!/bin/sh' > tests/test-c32ispunct.sh
|
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 {};
|
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 {
|
package grep {
|
||||||
description = "searches input for lines containing a match to a pattern";
|
description = "searches input for lines containing a match to a pattern";
|
||||||
website = "https://www.gnu.org/software/grep";
|
website = "https://www.gnu.org/software/grep";
|
||||||
|
|||||||
Reference in New Issue
Block a user