forked from rosa/hakurei
internal/rosa: pass stage alongside state
This cleans up many function signatures. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
@@ -7,12 +7,12 @@ import (
|
||||
"hakurei.app/internal/pkg"
|
||||
)
|
||||
|
||||
func (t Toolchain) newPython(s *S) (pkg.Artifact, string) {
|
||||
func (t Toolchain) newPython() (pkg.Artifact, string) {
|
||||
const (
|
||||
version = "3.14.5"
|
||||
checksum = "zYIpDlk2ftZ-UVGCQS1rthle2OHoyXV653ztWiopKV1NhmIJf1K2hHbkwM4DozQ9"
|
||||
)
|
||||
return s.NewPackage(t, "python", version, newTar(
|
||||
return t.NewPackage("python", version, newTar(
|
||||
"https://www.python.org/ftp/python/"+version+
|
||||
"/Python-"+version+".tgz",
|
||||
checksum,
|
||||
@@ -73,7 +73,7 @@ index 19aea290b58..51603ba9510 100644
|
||||
|
||||
// _ctypes appears to infer something from the linker name
|
||||
"LDFLAGS=-Wl,--dynamic-linker=/system/lib/" +
|
||||
"ld-musl-" + s.linuxArch() + ".so.1",
|
||||
"ld-musl-" + t.linuxArch() + ".so.1",
|
||||
},
|
||||
}, &MakeHelper{
|
||||
Check: []string{"test"},
|
||||
@@ -201,8 +201,8 @@ func (s *S) newPythonPackage(
|
||||
) {
|
||||
name = "python-" + name
|
||||
s.MustRegister(&Artifact{
|
||||
f: func(t Toolchain, s *S) (pkg.Artifact, string) {
|
||||
return s.NewPackage(t, name, version, source, attrP, attr, slices.Concat(
|
||||
f: func(t Toolchain) (pkg.Artifact, string) {
|
||||
return t.NewPackage(name, version, source, attrP, attr, slices.Concat(
|
||||
P{Python},
|
||||
extra,
|
||||
build,
|
||||
@@ -353,9 +353,9 @@ func init() {
|
||||
|
||||
func init() {
|
||||
native.MustRegister(&Artifact{
|
||||
f: func(t Toolchain, s *S) (pkg.Artifact, string) {
|
||||
source, version := s.Load(t, llvmSource)
|
||||
return s.NewPackage(t, "lit", version, source, nil, &PipHelper{
|
||||
f: func(t Toolchain) (pkg.Artifact, string) {
|
||||
source, version := t.Load(llvmSource)
|
||||
return t.NewPackage("lit", version, source, nil, &PipHelper{
|
||||
Append: []string{"llvm", "utils", "lit"},
|
||||
// already checked during llvm
|
||||
SkipCheck: true,
|
||||
|
||||
Reference in New Issue
Block a user