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/python.go | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'internal/rosa/python.go') diff --git a/internal/rosa/python.go b/internal/rosa/python.go index 2c98424b..1c9a2fe7 100644 --- a/internal/rosa/python.go +++ b/internal/rosa/python.go @@ -12,14 +12,15 @@ func (t Toolchain) newPython() pkg.Artifact { version = "3.14.2" checksum = "7nZunVMGj0viB-CnxpcRego2C90X5wFsMTgsoewd5z-KSZY2zLuqaBwG-14zmKys" ) - return t.NewViaMake("python", version, t.NewPatchedSource("python", version, pkg.NewHTTPGetTar( + return t.NewPackage("python", version, pkg.NewHTTPGetTar( nil, "https://www.python.org/ftp/python/"+version+ "/Python-"+version+".tgz", mustDecode(checksum), pkg.TarGzip, - ), false), &MakeAttr{ + ), &PackageAttr{ // test_synopsis_sourceless assumes this is writable and checks __pycache__ Writable: true, + Chmod: true, Env: []string{ "EXTRATESTOPTS=-j0 -x " + strings.Join([]string{ @@ -48,15 +49,16 @@ func (t Toolchain) newPython() pkg.Artifact { "LDFLAGS=-Wl,--dynamic-linker=/system/lib/" + "ld-musl-" + linuxArch() + ".so.1", }, + }, &MakeHelper{ Check: []string{"test"}, }, - t.Load(Zlib), - t.Load(Libffi), + Zlib, + Libffi, - t.Load(PkgConfig), - t.Load(OpenSSL), - t.Load(Bzip2), - t.Load(XZ), + PkgConfig, + OpenSSL, + Bzip2, + XZ, ) } func init() { artifactsF[Python] = Toolchain.newPython } -- cgit v1.3.1