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/openssl.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/openssl.go')
| -rw-r--r-- | internal/rosa/openssl.go | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/internal/rosa/openssl.go b/internal/rosa/openssl.go index 63617141..600355ef 100644 --- a/internal/rosa/openssl.go +++ b/internal/rosa/openssl.go @@ -7,17 +7,18 @@ func (t Toolchain) newOpenSSL() pkg.Artifact { version = "3.5.5" checksum = "I2Hp1LxcTR8j4G6LFEQMVy6EJH-Na1byI9Ti-ThBot6EMLNRnjGXGq-WXrim3Fkz" ) - return t.NewViaMake("openssl", version, pkg.NewHTTPGetTar( + return t.NewPackage("openssl", version, pkg.NewHTTPGetTar( nil, "https://github.com/openssl/openssl/releases/download/"+ "openssl-"+version+"/openssl-"+version+".tar.gz", mustDecode(checksum), pkg.TarGzip, - ), &MakeAttr{ - OmitDefaults: true, - + ), &PackageAttr{ Env: []string{ "CC=cc", }, + }, &MakeHelper{ + OmitDefaults: true, + ConfigureName: "/usr/src/openssl/Configure", Configure: [][2]string{ {"prefix", "/system"}, @@ -29,11 +30,11 @@ func (t Toolchain) newOpenSSL() pkg.Artifact { "test", }, }, - t.Load(Perl), - t.Load(Coreutils), + Perl, + Coreutils, - t.Load(Zlib), - t.Load(KernelHeaders), + Zlib, + KernelHeaders, ) } func init() { artifactsF[OpenSSL] = Toolchain.newOpenSSL } |