maemachinebroke/hakurei
1
0
Fork 0
forked from rosa/hakurei
Code Pull Requests Activity

internal/rosa: pass stage alongside state

Browse Source 
This cleans up many function signatures.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
Ophestra
2026-05-17 16:44:13 +09:00
parent 30eb0d6a61
commit 38bc2c7508
89 changed files with 563 additions and 558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
internal/rosa/gnu.go
View File

@@ -42,12 +42,12 @@ func skipGNUTests(tests ...int) string {
return buf.String()
}
func (t Toolchain) newM4(s *S) (pkg.Artifact, string) {
func (t Toolchain) newM4() (pkg.Artifact, string) {
const (
version = "1.4.21"
checksum = "pPa6YOo722Jw80l1OsH1tnUaklnPFjFT-bxGw5iAVrZTm1P8FQaWao_NXop46-pm"
)
return s.NewPackage(t, "m4", version, newTar(
return t.NewPackage("m4", version, newTar(
"https://ftpmirror.gnu.org/gnu/m4/m4-"+version+".tar.bz2",
checksum,
pkg.TarBzip2,
@@ -74,12 +74,12 @@ func init() {
})
}
func (t Toolchain) newBison(s *S) (pkg.Artifact, string) {
func (t Toolchain) newBison() (pkg.Artifact, string) {
const (
version = "3.8.2"
checksum = "BhRM6K7URj1LNOkIDCFDctSErLS-Xo5d9ba9seg10o6ACrgC1uNhED7CQPgIY29Y"
)
return s.NewPackage(t, "bison", version, newTar(
return t.NewPackage("bison", version, newTar(
"https://ftpmirror.gnu.org/gnu/bison/bison-"+version+".tar.gz",
checksum,
pkg.TarGzip,
@@ -109,12 +109,12 @@ func init() {
})
}
func (t Toolchain) newSed(s *S) (pkg.Artifact, string) {
func (t Toolchain) newSed() (pkg.Artifact, string) {
const (
version = "4.10"
checksum = "TXTRFQJCyflb-bpBRI2S5Y1DpplwvT7-KfXtpqN4AdZgZ5OtI6yStn1-bkhDKx51"
)
return s.NewPackage(t, "sed", version, newTar(
return t.NewPackage("sed", version, newTar(
"https://ftpmirror.gnu.org/gnu/sed/sed-"+version+".tar.gz",
checksum,
pkg.TarGzip,
@@ -136,12 +136,12 @@ func init() {
})
}
func (t Toolchain) newAutoconf(s *S) (pkg.Artifact, string) {
func (t Toolchain) newAutoconf() (pkg.Artifact, string) {
const (
version = "2.73"
checksum = "yGabDTeOfaCUB0JX-h3REYLYzMzvpDwFmFFzHNR7QilChCUNE4hR6q7nma4viDYg"
)
return s.NewPackage(t, "autoconf", version, newTar(
return t.NewPackage("autoconf", version, newTar(
"https://ftpmirror.gnu.org/gnu/autoconf/autoconf-"+version+".tar.gz",
checksum,
pkg.TarGzip,
@@ -176,12 +176,12 @@ func init() {
})
}
func (t Toolchain) newAutomake(s *S) (pkg.Artifact, string) {
func (t Toolchain) newAutomake() (pkg.Artifact, string) {
const (
version = "1.18.1"
checksum = "FjvLG_GdQP7cThTZJLDMxYpRcKdpAVG-YDs1Fj1yaHlSdh_Kx6nRGN14E0r_BjcG"
)
return s.NewPackage(t, "automake", version, newTar(
return t.NewPackage("automake", version, newTar(
"https://ftpmirror.gnu.org/gnu/automake/automake-"+version+".tar.gz",
checksum,
pkg.TarGzip,
@@ -220,18 +220,18 @@ func init() {
})
}
func (t Toolchain) newLibtool(s *S) (pkg.Artifact, string) {
func (t Toolchain) newLibtool() (pkg.Artifact, string) {
const (
version = "2.5.4"
checksum = "pa6LSrQggh8mSJHQfwGjysAApmZlGJt8wif2cCLzqAAa2jpsTY0jZ-6stS3BWZ2Q"
)
return s.NewPackage(t, "libtool", version, newTar(
return t.NewPackage("libtool", version, newTar(
"https://ftpmirror.gnu.org/gnu/libtool/libtool-"+version+".tar.gz",
checksum,
pkg.TarGzip,
), nil, &MakeHelper{
// _Z2a2c: symbol not found
SkipCheck: t.isStage0(),
SkipCheck: t.stage.isStage0(),
Check: []string{
"TESTSUITEFLAGS=" + jobsFlagE,
@@ -254,12 +254,12 @@ func init() {
})
}
func (t Toolchain) newGzip(s *S) (pkg.Artifact, string) {
func (t Toolchain) newGzip() (pkg.Artifact, string) {
const (
version = "1.14"
checksum = "NWhjUavnNfTDFkZJyAUonL9aCOak8GVajWX2OMlzpFnuI0ErpBFyj88mz2xSjz0q"
)
return s.NewPackage(t, "gzip", version, newTar(
return t.NewPackage("gzip", version, newTar(
"https://ftpmirror.gnu.org/gnu/gzip/gzip-"+version+".tar.gz",
checksum,
pkg.TarGzip,
@@ -280,12 +280,12 @@ func init() {
})
}
func (t Toolchain) newGettext(s *S) (pkg.Artifact, string) {
func (t Toolchain) newGettext() (pkg.Artifact, string) {
const (
version = "1.0"
checksum = "3MasKeEdPeFEgWgzsBKk7JqWqql1wEMbgPmzAfs-mluyokoW0N8oQVxPQoOnSdgC"
)
return s.NewPackage(t, "gettext", version, newTar(
return t.NewPackage("gettext", version, newTar(
"https://ftpmirror.gnu.org/gnu/gettext/gettext-"+version+".tar.gz",
checksum,
pkg.TarGzip,
@@ -326,12 +326,12 @@ func init() {
})
}
func (t Toolchain) newDiffutils(s *S) (pkg.Artifact, string) {
func (t Toolchain) newDiffutils() (pkg.Artifact, string) {
const (
version = "3.12"
checksum = "9J5VAq5oA7eqwzS1Yvw-l3G5o-TccUrNQR3PvyB_lgdryOFAfxtvQfKfhdpquE44"
)
return s.NewPackage(t, "diffutils", version, newTar(
return t.NewPackage("diffutils", version, newTar(
"https://ftpmirror.gnu.org/gnu/diffutils/diffutils-"+version+".tar.gz",
checksum,
pkg.TarGzip,
@@ -359,12 +359,12 @@ func init() {
})
}
func (t Toolchain) newPatch(s *S) (pkg.Artifact, string) {
func (t Toolchain) newPatch() (pkg.Artifact, string) {
const (
version = "2.8"
checksum = "MA0BQc662i8QYBD-DdGgyyfTwaeALZ1K0yusV9rAmNiIsQdX-69YC4t9JEGXZkeR"
)
return s.NewPackage(t, "patch", version, newTar(
return t.NewPackage("patch", version, newTar(
"https://ftpmirror.gnu.org/gnu/patch/patch-"+version+".tar.gz",
checksum,
pkg.TarGzip,
@@ -391,12 +391,12 @@ func init() {
})
}
func (t Toolchain) newBash(s *S) (pkg.Artifact, string) {
func (t Toolchain) newBash() (pkg.Artifact, string) {
const (
version = "5.3"
checksum = "4LQ_GRoB_ko-Ih8QPf_xRKA02xAm_TOxQgcJLmFDT6udUPxTAWrsj-ZNeuTusyDq"
)
return s.NewPackage(t, "bash", version, newTar(
return t.NewPackage("bash", version, newTar(
"https://ftpmirror.gnu.org/gnu/bash/bash-"+version+".tar.gz",
checksum,
pkg.TarGzip,
@@ -421,12 +421,12 @@ func init() {
})
}
func (t Toolchain) newCoreutils(s *S) (pkg.Artifact, string) {
func (t Toolchain) newCoreutils() (pkg.Artifact, string) {
const (
version = "9.11"
checksum = "t8UMed5wpFEoC56aa42_yidfOAaRGzOfj7MRtQkkqgGbpXiskNA8bd-EmVSQkZie"
)
return s.NewPackage(t, "coreutils", version, newTar(
return t.NewPackage("coreutils", version, newTar(
"https://ftpmirror.gnu.org/gnu/coreutils/coreutils-"+version+".tar.gz",
checksum,
pkg.TarGzip,
@@ -467,12 +467,12 @@ func init() {
})
}
func (t Toolchain) newTexinfo(s *S) (pkg.Artifact, string) {
func (t Toolchain) newTexinfo() (pkg.Artifact, string) {
const (
version = "7.3"
checksum = "RRmC8Xwdof7JuZJeWGAQ_GeASIHAuJFQMbNONXBz5InooKIQGmqmWRjGNGEr5n4-"
)
return s.NewPackage(t, "texinfo", version, newTar(
return t.NewPackage("texinfo", version, newTar(
"https://ftpmirror.gnu.org/gnu/texinfo/texinfo-"+version+".tar.gz",
checksum,
pkg.TarGzip,
@@ -500,12 +500,12 @@ func init() {
})
}
func (t Toolchain) newGperf(s *S) (pkg.Artifact, string) {
func (t Toolchain) newGperf() (pkg.Artifact, string) {
const (
version = "3.3"
checksum = "RtIy9pPb_Bb8-31J2Nw-rRGso2JlS-lDlVhuNYhqR7Nt4xM_nObznxAlBMnarJv7"
)
return s.NewPackage(t, "gperf", version, newTar(
return t.NewPackage("gperf", version, newTar(
"https://ftpmirror.gnu.org/gperf/gperf-"+version+".tar.gz",
checksum,
pkg.TarGzip,
@@ -525,12 +525,12 @@ func init() {
})
}
func (t Toolchain) newGawk(s *S) (pkg.Artifact, string) {
func (t Toolchain) newGawk() (pkg.Artifact, string) {
const (
version = "5.4.0"
checksum = "m0RkIolC-PI7EY5q8pcx5Y-0twlIW0Yp3wXXmV-QaHorSdf8BhZ7kW9F8iWomz0C"
)
return s.NewPackage(t, "gawk", version, newTar(
return t.NewPackage("gawk", version, newTar(
"https://ftpmirror.gnu.org/gnu/gawk/gawk-"+version+".tar.gz",
checksum,
pkg.TarGzip,
@@ -553,12 +553,12 @@ func init() {
})
}
func (t Toolchain) newGrep(s *S) (pkg.Artifact, string) {
func (t Toolchain) newGrep() (pkg.Artifact, string) {
const (
version = "3.12"
checksum = "qMB4RjaPNRRYsxix6YOrjE8gyAT1zVSTy4nW4wKW9fqa0CHYAuWgPwDTirENzm_1"
)
return s.NewPackage(t, "grep", version, newTar(
return t.NewPackage("grep", version, newTar(
"https://ftpmirror.gnu.org/gnu/grep/grep-"+version+".tar.gz",
checksum,
pkg.TarGzip,
@@ -586,12 +586,12 @@ func init() {
})
}
func (t Toolchain) newFindutils(s *S) (pkg.Artifact, string) {
func (t Toolchain) newFindutils() (pkg.Artifact, string) {
const (
version = "4.10.0"
checksum = "ZXABdNBQXL7QjTygynRRTdXYWxQKZ0Wn5eMd3NUnxR0xaS0u0VfcKoTlbo50zxv6"
)
return s.NewPackage(t, "findutils", version, pkg.NewHTTPGet(
return t.NewPackage("findutils", version, pkg.NewHTTPGet(
nil, "https://ftpmirror.gnu.org/gnu/findutils/findutils-"+version+".tar.xz",
mustDecode(checksum),
), &PackageAttr{
@@ -617,12 +617,12 @@ func init() {
})
}
func (t Toolchain) newBC(s *S) (pkg.Artifact, string) {
func (t Toolchain) newBC() (pkg.Artifact, string) {
const (
version = "1.08.2"
checksum = "8h6f3hjV80XiFs6v9HOPF2KEyg1kuOgn5eeFdVspV05ODBVQss-ey5glc8AmneLy"
)
return s.NewPackage(t, "bc", version, newTar(
return t.NewPackage("bc", version, newTar(
"https://ftpmirror.gnu.org/gnu/bc/bc-"+version+".tar.gz",
checksum,
pkg.TarGzip,
@@ -646,12 +646,12 @@ func init() {
})
}
func (t Toolchain) newLibiconv(s *S) (pkg.Artifact, string) {
func (t Toolchain) newLibiconv() (pkg.Artifact, string) {
const (
version = "1.19"
checksum = "UibB6E23y4MksNqYmCCrA3zTFO6vJugD1DEDqqWYFZNuBsUWMVMcncb_5pPAr88x"
)
return s.NewPackage(t, "libiconv", version, newTar(
return t.NewPackage("libiconv", version, newTar(
"https://ftpmirror.gnu.org/gnu/libiconv/libiconv-"+version+".tar.gz",
checksum,
pkg.TarGzip,
@@ -669,12 +669,12 @@ func init() {
})
}
func (t Toolchain) newTar(s *S) (pkg.Artifact, string) {
func (t Toolchain) newTar() (pkg.Artifact, string) {
const (
version = "1.35"
checksum = "zSaoSlVUDW0dSfm4sbL4FrXLFR8U40Fh3zY5DWhR5NCIJ6GjU6Kc4VZo2-ZqpBRA"
)
return s.NewPackage(t, "tar", version, newTar(
return t.NewPackage("tar", version, newTar(
"https://ftpmirror.gnu.org/gnu/tar/tar-"+version+".tar.gz",
checksum,
pkg.TarGzip,
@@ -711,12 +711,12 @@ func init() {
})
}
func (t Toolchain) newParallel(s *S) (pkg.Artifact, string) {
func (t Toolchain) newParallel() (pkg.Artifact, string) {
const (
version = "20260422"
checksum = "eTsepxgqhXpMEhPd55qh-W5y4vjKn0x9TD2mzbJCNZYtFf4lT4Wzoqr74HGJYBEH"
)
return s.NewPackage(t, "parallel", version, newTar(
return t.NewPackage("parallel", version, newTar(
"https://ftpmirror.gnu.org/gnu/parallel/parallel-"+version+".tar.bz2",
checksum,
pkg.TarBzip2,
@@ -745,12 +745,12 @@ func init() {
})
}
func (t Toolchain) newLibunistring(s *S) (pkg.Artifact, string) {
func (t Toolchain) newLibunistring() (pkg.Artifact, string) {
const (
version = "1.4.2"
checksum = "iW9BbfLoVlXjWoLTZ4AekQSu4cFBnLcZ4W8OHWbv0AhJNgD3j65_zqaLMzFKylg2"
)
return s.NewPackage(t, "libunistring", version, newTar(
return t.NewPackage("libunistring", version, newTar(
"https://ftpmirror.gnu.org/gnu/libunistring/libunistring-"+version+".tar.gz",
checksum,
pkg.TarGzip,
@@ -778,12 +778,12 @@ func init() {
})
}
func (t Toolchain) newLibtasn1(s *S) (pkg.Artifact, string) {
func (t Toolchain) newLibtasn1() (pkg.Artifact, string) {
const (
version = "4.21.0"
checksum = "9DYI3UYbfYLy8JsKUcY6f0irskbfL0fHZA91Q-JEOA3kiUwpodyjemRsYRjUpjuq"
)
return s.NewPackage(t, "libtasn1", version, newTar(
return t.NewPackage("libtasn1", version, newTar(
"https://ftpmirror.gnu.org/gnu/libtasn1/libtasn1-"+version+".tar.gz",
checksum,
pkg.TarGzip,
@@ -801,12 +801,12 @@ func init() {
})
}
func (t Toolchain) newReadline(s *S) (pkg.Artifact, string) {
func (t Toolchain) newReadline() (pkg.Artifact, string) {
const (
version = "8.3"
checksum = "r-lcGRJq_MvvBpOq47Z2Y1OI2iqrmtcqhTLVXR0xWo37ZpC2uT_md7gKq5o_qTMV"
)
return s.NewPackage(t, "readline", version, newTar(
return t.NewPackage("readline", version, newTar(
"https://ftpmirror.gnu.org/gnu/readline/readline-"+version+".tar.gz",
checksum,
pkg.TarGzip,
@@ -835,21 +835,21 @@ func init() {
})
}
func (t Toolchain) newGnuTLS(s *S) (pkg.Artifact, string) {
func (t Toolchain) newGnuTLS() (pkg.Artifact, string) {
const (
version = "3.8.12"
checksum = "VPdP-nRydQQRJcnma-YA7CJYA_kzTJ2rb3QFeP6D27emSyInJ8sQ-Wzn518I38dl"
)
var configureExtra []KV
switch s.arch {
switch t.arch {
case "arm64":
configureExtra = []KV{
{"disable-hardware-acceleration"},
}
}
return s.NewPackage(t, "gnutls", version, s.newTagRemote(t,
return t.NewPackage("gnutls", version, t.newTagRemote(
"https://gitlab.com/gnutls/gnutls.git",
version, checksum,
), &PackageAttr{
@@ -1016,12 +1016,12 @@ func init() {
})
}
func (t Toolchain) newBinutils(s *S) (pkg.Artifact, string) {
func (t Toolchain) newBinutils() (pkg.Artifact, string) {
const (
version = "2.46.0"
checksum = "4kK1_EXQipxSqqyvwD4LbiMLFKCUApjq6PeG4XJP4dzxYGqDeqXfh8zLuTyOuOVR"
)
return s.NewPackage(t, "binutils", version, newTar(
return t.NewPackage("binutils", version, newTar(
"https://ftpmirror.gnu.org/gnu/binutils/binutils-"+version+".tar.bz2",
checksum,
pkg.TarBzip2,
@@ -1041,12 +1041,12 @@ func init() {
})
}
func (t Toolchain) newGMP(s *S) (pkg.Artifact, string) {
func (t Toolchain) newGMP() (pkg.Artifact, string) {
const (
version = "6.3.0"
checksum = "yrgbgEDWKDdMWVHh7gPbVl56-sRtVVhfvv0M_LX7xMUUk_mvZ1QOJEAnt7g4i3k5"
)
return s.NewPackage(t, "gmp", version, newTar(
return t.NewPackage("gmp", version, newTar(
"https://gcc.gnu.org/pub/gcc/infrastructure/"+
"gmp-"+version+".tar.bz2",
checksum,
@@ -1071,12 +1071,12 @@ func init() {
})
}
func (t Toolchain) newMPFR(s *S) (pkg.Artifact, string) {
func (t Toolchain) newMPFR() (pkg.Artifact, string) {
const (
version = "4.2.2"
checksum = "wN3gx0zfIuCn9r3VAn_9bmfvAYILwrRfgBjYSD1IjLqyLrLojNN5vKyQuTE9kA-B"
)
return s.NewPackage(t, "mpfr", version, newTar(
return t.NewPackage("mpfr", version, newTar(
"https://gcc.gnu.org/pub/gcc/infrastructure/"+
"mpfr-"+version+".tar.bz2",
checksum,
@@ -1101,12 +1101,12 @@ func init() {
})
}
func (t Toolchain) newMPC(s *S) (pkg.Artifact, string) {
func (t Toolchain) newMPC() (pkg.Artifact, string) {
const (
version = "1.4.1"
checksum = "ZffaZyWkvIw0iPvRe5EJ7O-VvHtSkbbb3K_7SgPtK810NvGan7nbF0T5-6tozjQN"
)
return s.NewPackage(t, "mpc", version, newFromGitLab(
return t.NewPackage("mpc", version, newFromGitLab(
"gitlab.inria.fr",
"mpc/mpc",
version, checksum,
@@ -1140,19 +1140,19 @@ func init() {
})
}
func (t Toolchain) newGCC(s *S) (pkg.Artifact, string) {
func (t Toolchain) newGCC() (pkg.Artifact, string) {
const (
version = "16.1.0"
checksum = "4ASoWbxaA2FW7PAB0zzHDPC5XnNhyaAyjtDPpGzceSLeYnEIXsNYZR3PA_Zu5P0K"
)
var configureExtra []KV
switch s.arch {
switch t.arch {
case "amd64", "arm64":
configureExtra = append(configureExtra, KV{"with-multilib-list", "''"})
}
return s.NewPackage(t, "gcc", version, newTar(
return t.NewPackage("gcc", version, newTar(
"https://ftp.tsukuba.wide.ad.jp/software/gcc/releases/"+
"gcc-"+version+"/gcc-"+version+".tar.gz",
checksum,