diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-03-01 23:54:40 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-03-02 01:24:50 +0900 |
| commit | cc60e0d15d79916a69c8a1caeb3c4611351bb6c4 (patch) | |
| tree | 67f4f59ed7ba7b18af51338e56ffa8d9acf52da6 /internal/rosa/musl-obstack.go | |
| parent | 9deaf853f0676ee4475468bffd35aae7e1160a74 (diff) | |
internal/rosa/make: migrate to helper interface
This also updates all affected artifacts to use new behaviour.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'internal/rosa/musl-obstack.go')
| -rw-r--r-- | internal/rosa/musl-obstack.go | 23 |
1 files changed, 10 insertions, 13 deletions
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 } |