From cc60e0d15d79916a69c8a1caeb3c4611351bb6c4 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Sun, 1 Mar 2026 23:54:40 +0900 Subject: internal/rosa/make: migrate to helper interface This also updates all affected artifacts to use new behaviour. Signed-off-by: Ophestra --- internal/rosa/musl-obstack.go | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'internal/rosa/musl-obstack.go') diff --git a/internal/rosa/musl-obstack.go b/internal/rosa/musl-obstack.go index 2b45ed87..1f100db2 100644 --- a/internal/rosa/musl-obstack.go +++ b/internal/rosa/musl-obstack.go @@ -7,27 +7,24 @@ func (t Toolchain) newMuslObstack() pkg.Artifact { version = "1.2.3" checksum = "tVRY_KjIlkkMszcaRlkKdBVQHIXTT_T_TiMxbwErlILXrOBosocg8KklppZhNdCG" ) - return t.NewViaMake("musl-obstack", version, pkg.NewHTTPGetTar( + return t.NewPackage("musl-obstack", version, pkg.NewHTTPGetTar( nil, "https://github.com/void-linux/musl-obstack/archive/refs/tags/"+ "v"+version+".tar.gz", mustDecode(checksum), pkg.TarGzip, - ), &MakeAttr{ - Writable: true, + ), &PackageAttr{ Env: []string{ "CC=cc -fPIC", }, - ScriptEarly: ` -cd /usr/src/musl-obstack -./bootstrap.sh -`, + }, &MakeHelper{ + Generate: "./bootstrap.sh", }, - t.Load(M4), - t.Load(Perl), - t.Load(Autoconf), - t.Load(Automake), - t.Load(Libtool), - t.Load(PkgConfig), + M4, + Perl, + Autoconf, + Automake, + Libtool, + PkgConfig, ) } func init() { artifactsF[MuslObstack] = Toolchain.newMuslObstack } -- cgit v1.3.1