diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-01-31 05:09:17 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-01-31 08:55:33 +0900 |
| commit | 8b4576bc5f6eaaf703886629f2dfa12ba38b574c (patch) | |
| tree | f347a2189841297be8c5bc96b02dfc610490b19d /internal/rosa/zlib.go | |
| parent | 29ebc52e26811b0a657bd1978b0c02284822462f (diff) | |
internal/rosa: migrate to make helper
This migrates artifacts that the helper cannot produce an identical instance of.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'internal/rosa/zlib.go')
| -rw-r--r-- | internal/rosa/zlib.go | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/internal/rosa/zlib.go b/internal/rosa/zlib.go index 55346ee8..6ebd5a3d 100644 --- a/internal/rosa/zlib.go +++ b/internal/rosa/zlib.go @@ -7,19 +7,16 @@ func (t Toolchain) newZlib() pkg.Artifact { version = "1.3.1" checksum = "E-eIpNzE8oJ5DsqH4UuA_0GDKuQF5csqI8ooDx2w7Vx-woJ2mb-YtSbEyIMN44mH" ) - return t.New("zlib-"+version, 0, []pkg.Artifact{ - t.Load(Make), - }, nil, nil, ` -cd "$(mktemp -d)" -CC="clang -fPIC" /usr/src/zlib/configure \ - --prefix /system -make "-j$(nproc)" test -make DESTDIR=/work install -`, pkg.Path(AbsUsrSrc.Append("zlib"), true, - pkg.NewHTTPGetTar( - nil, "https://zlib.net/zlib-"+version+".tar.gz", - mustDecode(checksum), - pkg.TarGzip, - ))) + return t.NewViaMake("zlib", version, pkg.NewHTTPGetTar( + nil, "https://zlib.net/zlib-"+version+".tar.gz", + mustDecode(checksum), + pkg.TarGzip, + ), &MakeAttr{ + OmitDefaults: true, + Env: []string{ + "CC=clang -fPIC", + }, + Build: `""`, + }) } func init() { artifactsF[Zlib] = Toolchain.newZlib } |