From 016d745b94b31d0ef4fd54d2a04dc9e09b3f0d20 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Thu, 22 Oct 2026 14:17:56 +0900 Subject: internal/rosa: bootstrap make in two steps This enables the test suite in the second make stage. This change also fixes a typo in the second stage make build script. Signed-off-by: Ophestra --- internal/rosa/package/make.az | 49 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 7 deletions(-) (limited to 'internal/rosa/package/make.az') diff --git a/internal/rosa/package/make.az b/internal/rosa/package/make.az index 771bd20d..4aaf5736 100644 --- a/internal/rosa/package/make.az +++ b/internal/rosa/package/make.az @@ -1,26 +1,61 @@ -package make { - description = "a tool which controls the generation of executables and other non-source files"; - website = "https://www.gnu.org/software/make"; - anitya = 1877; +package make-source { + description = "GNU make source tree"; + exclude = true; version# = "4.4.1"; - source = remoteTar { + output = remoteTar { url = "https://mirrors.kernel.org/gnu/make/make-"+version+".tar.gz"; checksum = "YS_B07ZcAy9PbaK5_vKGj64SrxO2VMpnMKfc9I0Q9IC1rn0RwOH7802pJoj2Mq4a"; compress = gzip; }; +} +package make-early { + description = "early, dependency-free build of make"; + exclude = true; + + source = make-source; toyboxEarly = true; exec = generic { - build = `/usr/src/make/configure \ + build = `/usr/src/make-early/configure \ --prefix=/system \ - --host= '`+triple+`' \ + --host='`+triple+`' \ + --target='`+triple+`' \ --build='`+hostTriple+`' \ --disable-dependency-tracking ./build.sh `; // test suite wants perl + check = ""; + install = "./make DESTDIR=/work install\n"; }; } +package make { + description = "a tool which controls the generation of executables and other non-source files"; + website = "https://www.gnu.org/software/make"; + anitya = 1877; + + source = make-source; + toyboxEarly = true; + + // GNU tar not yet available + writable = true; + early = ` +chmod +w tests/scripts/misc +rm \ + tests/scripts/misc/close_stdout \ + tests/scripts/misc/general4 +`; + + exec = make { + early = true; + defaults = false; + }; + + tools = [ + perl, + gzip, + ]; +} -- cgit v1.3.1