aboutsummaryrefslogtreecommitdiffhomepage
path: root/internal/rosa/python.go
diff options
context:
space:
mode:
Diffstat (limited to 'internal/rosa/python.go')
-rw-r--r--internal/rosa/python.go18
1 files changed, 10 insertions, 8 deletions
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 }