From 80e20bf4caa9a2edbc8c483fc2c41b75e95e96be Mon Sep 17 00:00:00 2001 From: Ophestra Date: Thu, 12 Nov 2026 16:51:16 +0900 Subject: internal/rosa: replace GNU patch This does a bunch of unnecessary things and is another heavy piece of GNU software we can get rid of. Toybox patch works just fine. This causes rebuilds due to backup files no longer being created. Signed-off-by: Ophestra --- internal/rosa/llvm_test.go | 2 +- internal/rosa/package/gnu.az | 27 --------------------------- internal/rosa/rosa.go | 2 -- 3 files changed, 1 insertion(+), 30 deletions(-) (limited to 'internal') diff --git a/internal/rosa/llvm_test.go b/internal/rosa/llvm_test.go index 50c4456b..c90e063b 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 = 684 + const wantInputCount = 669 _, llvm := rosa.MustLoad(rosa.H("llvm")) var n int diff --git a/internal/rosa/package/gnu.az b/internal/rosa/package/gnu.az index 81762364..f6927143 100644 --- a/internal/rosa/package/gnu.az +++ b/internal/rosa/package/gnu.az @@ -179,33 +179,6 @@ test_disable '#!/bin/sh' tests/cmp }; } -package patch { - description = "a program to apply diff output to files"; - website = "https://savannah.gnu.org/projects/patch"; - anitya = 2597; - - version# = "2.8"; - source = remoteTar { - url = "https://mirrors.kernel.org/gnu/patch/patch-"+version+".tar.gz"; - checksum = "MA0BQc662i8QYBD-DdGgyyfTwaeALZ1K0yusV9rAmNiIsQdX-69YC4t9JEGXZkeR"; - compress = gzip; - }; - - writable = true; - early = ` -test_disable() { chmod +w "$2" && echo "$1" > "$2"; } - -test_disable '#!/bin/sh' tests/ed-style -test_disable '#!/bin/sh' tests/need-filename -`; - - toyboxEarly = true; - exec = make { - early = true; - defaults = false; - }; -} - package grep { description = "searches input for lines containing a match to a pattern"; website = "https://www.gnu.org/software/grep"; diff --git a/internal/rosa/rosa.go b/internal/rosa/rosa.go index 845919bf..bb9dc317 100644 --- a/internal/rosa/rosa.go +++ b/internal/rosa/rosa.go @@ -234,7 +234,6 @@ var ( _toybox = H("toybox") _toyboxEarly = H("toybox-early") _llvm = H("llvm") - _patch = H("patch") _qemu = H("qemu") ) @@ -290,7 +289,6 @@ function apply { return t.native().New(name+"-src", Unversioned, nil, &PackageAttr{ Paths: paths, - Tools: P{_patch}, NoArch: true, }, &GenericHelper{ Build: buf.String(), -- cgit v1.3.1