internal/rosa: key metadata by string

For upcoming azalea integration. The API is quite ugly right now to ease migration.

Signed-off-by: Ophestra <cat@gensokyo.uk>

1 files changed, 122 insertions, 122 deletions

diff --git a/internal/rosa/gnu.go b/internal/rosa/gnu.go
index 526bcb4a..0527f616 100644
--- a/internal/rosa/gnu.go
+++ b/internal/rosa/gnu.go
@@ -42,12 +42,12 @@ func skipGNUTests(tests ...int) string {
 	return buf.String()
 }
 
-func (t Toolchain) newM4() (pkg.Artifact, string) {
+func (t Toolchain) newM4(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "1.4.21"
 		checksum = "pPa6YOo722Jw80l1OsH1tnUaklnPFjFT-bxGw5iAVrZTm1P8FQaWao_NXop46-pm"
 	)
-	return t.NewPackage("m4", version, newTar(
+	return s.NewPackage(t, "m4", version, newTar(
 		"https://ftpmirror.gnu.org/gnu/m4/m4-"+version+".tar.bz2",
 		checksum,
 		pkg.TarBzip2,
@@ -63,7 +63,7 @@ chmod +w tests/test-c32ispunct.sh && echo '#!/bin/sh' > tests/test-c32ispunct.sh
 	), version
 }
 func init() {
-	artifactsM[M4] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newM4,
 
 		Name:        "m4",
@@ -71,15 +71,15 @@ func init() {
 		Website:     "https://www.gnu.org/software/m4/",
 
 		ID: 1871,
-	}
+	})
 }
 
-func (t Toolchain) newBison() (pkg.Artifact, string) {
+func (t Toolchain) newBison(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "3.8.2"
 		checksum = "BhRM6K7URj1LNOkIDCFDctSErLS-Xo5d9ba9seg10o6ACrgC1uNhED7CQPgIY29Y"
 	)
-	return t.NewPackage("bison", version, newTar(
+	return s.NewPackage(t, "bison", version, newTar(
 		"https://ftpmirror.gnu.org/gnu/bison/bison-"+version+".tar.gz",
 		checksum,
 		pkg.TarGzip,
@@ -98,7 +98,7 @@ func (t Toolchain) newBison() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[Bison] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newBison,
 
 		Name:        "bison",
@@ -106,15 +106,15 @@ func init() {
 		Website:     "https://www.gnu.org/software/bison/",
 
 		ID: 193,
-	}
+	})
 }
 
-func (t Toolchain) newSed() (pkg.Artifact, string) {
+func (t Toolchain) newSed(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "4.10"
 		checksum = "TXTRFQJCyflb-bpBRI2S5Y1DpplwvT7-KfXtpqN4AdZgZ5OtI6yStn1-bkhDKx51"
 	)
-	return t.NewPackage("sed", version, newTar(
+	return s.NewPackage(t, "sed", version, newTar(
 		"https://ftpmirror.gnu.org/gnu/sed/sed-"+version+".tar.gz",
 		checksum,
 		pkg.TarGzip,
@@ -125,7 +125,7 @@ func (t Toolchain) newSed() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[Sed] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newSed,
 
 		Name:        "sed",
@@ -133,15 +133,15 @@ func init() {
 		Website:     "https://www.gnu.org/software/sed/",
 
 		ID: 4789,
-	}
+	})
 }
 
-func (t Toolchain) newAutoconf() (pkg.Artifact, string) {
+func (t Toolchain) newAutoconf(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "2.73"
 		checksum = "yGabDTeOfaCUB0JX-h3REYLYzMzvpDwFmFFzHNR7QilChCUNE4hR6q7nma4viDYg"
 	)
-	return t.NewPackage("autoconf", version, newTar(
+	return s.NewPackage(t, "autoconf", version, newTar(
 		"https://ftpmirror.gnu.org/gnu/autoconf/autoconf-"+version+".tar.gz",
 		checksum,
 		pkg.TarGzip,
@@ -160,7 +160,7 @@ func (t Toolchain) newAutoconf() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[Autoconf] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newAutoconf,
 
 		Name:        "autoconf",
@@ -173,15 +173,15 @@ func init() {
 		},
 
 		ID: 141,
-	}
+	})
 }
 
-func (t Toolchain) newAutomake() (pkg.Artifact, string) {
+func (t Toolchain) newAutomake(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "1.18.1"
 		checksum = "FjvLG_GdQP7cThTZJLDMxYpRcKdpAVG-YDs1Fj1yaHlSdh_Kx6nRGN14E0r_BjcG"
 	)
-	return t.NewPackage("automake", version, newTar(
+	return s.NewPackage(t, "automake", version, newTar(
 		"https://ftpmirror.gnu.org/gnu/automake/automake-"+version+".tar.gz",
 		checksum,
 		pkg.TarGzip,
@@ -205,7 +205,7 @@ test_disable '#!/bin/sh' t/pr9.sh
 	), version
 }
 func init() {
-	artifactsM[Automake] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newAutomake,
 
 		Name:        "automake",
@@ -217,15 +217,15 @@ func init() {
 		},
 
 		ID: 144,
-	}
+	})
 }
 
-func (t Toolchain) newLibtool() (pkg.Artifact, string) {
+func (t Toolchain) newLibtool(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "2.5.4"
 		checksum = "pa6LSrQggh8mSJHQfwGjysAApmZlGJt8wif2cCLzqAAa2jpsTY0jZ-6stS3BWZ2Q"
 	)
-	return t.NewPackage("libtool", version, newTar(
+	return s.NewPackage(t, "libtool", version, newTar(
 		"https://ftpmirror.gnu.org/gnu/libtool/libtool-"+version+".tar.gz",
 		checksum,
 		pkg.TarGzip,
@@ -243,7 +243,7 @@ func (t Toolchain) newLibtool() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[Libtool] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newLibtool,
 
 		Name:        "libtool",
@@ -251,15 +251,15 @@ func init() {
 		Website:     "https://www.gnu.org/software/libtool/",
 
 		ID: 1741,
-	}
+	})
 }
 
-func (t Toolchain) newGzip() (pkg.Artifact, string) {
+func (t Toolchain) newGzip(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "1.14"
 		checksum = "NWhjUavnNfTDFkZJyAUonL9aCOak8GVajWX2OMlzpFnuI0ErpBFyj88mz2xSjz0q"
 	)
-	return t.NewPackage("gzip", version, newTar(
+	return s.NewPackage(t, "gzip", version, newTar(
 		"https://ftpmirror.gnu.org/gnu/gzip/gzip-"+version+".tar.gz",
 		checksum,
 		pkg.TarGzip,
@@ -269,7 +269,7 @@ func (t Toolchain) newGzip() (pkg.Artifact, string) {
 	}), version
 }
 func init() {
-	artifactsM[Gzip] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newGzip,
 
 		Name:        "gzip",
@@ -277,15 +277,15 @@ func init() {
 		Website:     "https://www.gnu.org/software/gzip/",
 
 		ID: 1290,
-	}
+	})
 }
 
-func (t Toolchain) newGettext() (pkg.Artifact, string) {
+func (t Toolchain) newGettext(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "1.0"
 		checksum = "3MasKeEdPeFEgWgzsBKk7JqWqql1wEMbgPmzAfs-mluyokoW0N8oQVxPQoOnSdgC"
 	)
-	return t.NewPackage("gettext", version, newTar(
+	return s.NewPackage(t, "gettext", version, newTar(
 		"https://ftpmirror.gnu.org/gnu/gettext/gettext-"+version+".tar.gz",
 		checksum,
 		pkg.TarGzip,
@@ -315,7 +315,7 @@ touch gettext-tools/autotools/archive.dir.tar
 	), version
 }
 func init() {
-	artifactsM[Gettext] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newGettext,
 
 		Name:        "gettext",
@@ -323,15 +323,15 @@ func init() {
 		Website:     "https://www.gnu.org/software/gettext/",
 
 		ID: 898,
-	}
+	})
 }
 
-func (t Toolchain) newDiffutils() (pkg.Artifact, string) {
+func (t Toolchain) newDiffutils(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "3.12"
 		checksum = "9J5VAq5oA7eqwzS1Yvw-l3G5o-TccUrNQR3PvyB_lgdryOFAfxtvQfKfhdpquE44"
 	)
-	return t.NewPackage("diffutils", version, newTar(
+	return s.NewPackage(t, "diffutils", version, newTar(
 		"https://ftpmirror.gnu.org/gnu/diffutils/diffutils-"+version+".tar.gz",
 		checksum,
 		pkg.TarGzip,
@@ -348,7 +348,7 @@ test_disable '#!/bin/sh' tests/cmp
 	}, (*MakeHelper)(nil)), version
 }
 func init() {
-	artifactsM[Diffutils] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newDiffutils,
 
 		Name:        "diffutils",
@@ -356,15 +356,15 @@ func init() {
 		Website:     "https://www.gnu.org/software/diffutils/",
 
 		ID: 436,
-	}
+	})
 }
 
-func (t Toolchain) newPatch() (pkg.Artifact, string) {
+func (t Toolchain) newPatch(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "2.8"
 		checksum = "MA0BQc662i8QYBD-DdGgyyfTwaeALZ1K0yusV9rAmNiIsQdX-69YC4t9JEGXZkeR"
 	)
-	return t.NewPackage("patch", version, newTar(
+	return s.NewPackage(t, "patch", version, newTar(
 		"https://ftpmirror.gnu.org/gnu/patch/patch-"+version+".tar.gz",
 		checksum,
 		pkg.TarGzip,
@@ -380,7 +380,7 @@ test_disable '#!/bin/sh' tests/need-filename
 	}, (*MakeHelper)(nil)), version
 }
 func init() {
-	artifactsM[Patch] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newPatch,
 
 		Name:        "patch",
@@ -388,15 +388,15 @@ func init() {
 		Website:     "https://savannah.gnu.org/projects/patch/",
 
 		ID: 2597,
-	}
+	})
 }
 
-func (t Toolchain) newBash() (pkg.Artifact, string) {
+func (t Toolchain) newBash(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "5.3"
 		checksum = "4LQ_GRoB_ko-Ih8QPf_xRKA02xAm_TOxQgcJLmFDT6udUPxTAWrsj-ZNeuTusyDq"
 	)
-	return t.NewPackage("bash", version, newTar(
+	return s.NewPackage(t, "bash", version, newTar(
 		"https://ftpmirror.gnu.org/gnu/bash/bash-"+version+".tar.gz",
 		checksum,
 		pkg.TarGzip,
@@ -410,7 +410,7 @@ func (t Toolchain) newBash() (pkg.Artifact, string) {
 	}), version
 }
 func init() {
-	artifactsM[Bash] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newBash,
 
 		Name:        "bash",
@@ -418,15 +418,15 @@ func init() {
 		Website:     "https://www.gnu.org/software/bash/",
 
 		ID: 166,
-	}
+	})
 }
 
-func (t Toolchain) newCoreutils() (pkg.Artifact, string) {
+func (t Toolchain) newCoreutils(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "9.11"
 		checksum = "t8UMed5wpFEoC56aa42_yidfOAaRGzOfj7MRtQkkqgGbpXiskNA8bd-EmVSQkZie"
 	)
-	return t.NewPackage("coreutils", version, newTar(
+	return s.NewPackage(t, "coreutils", version, newTar(
 		"https://ftpmirror.gnu.org/gnu/coreutils/coreutils-"+version+".tar.gz",
 		checksum,
 		pkg.TarGzip,
@@ -456,7 +456,7 @@ test_disable 'int main(){return 0;}' gnulib-tests/test-lchown.c
 	), version
 }
 func init() {
-	artifactsM[Coreutils] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newCoreutils,
 
 		Name:        "coreutils",
@@ -464,15 +464,15 @@ func init() {
 		Website:     "https://www.gnu.org/software/coreutils/",
 
 		ID: 343,
-	}
+	})
 }
 
-func (t Toolchain) newTexinfo() (pkg.Artifact, string) {
+func (t Toolchain) newTexinfo(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "7.3"
 		checksum = "RRmC8Xwdof7JuZJeWGAQ_GeASIHAuJFQMbNONXBz5InooKIQGmqmWRjGNGEr5n4-"
 	)
-	return t.NewPackage("texinfo", version, newTar(
+	return s.NewPackage(t, "texinfo", version, newTar(
 		"https://ftpmirror.gnu.org/gnu/texinfo/texinfo-"+version+".tar.gz",
 		checksum,
 		pkg.TarGzip,
@@ -484,7 +484,7 @@ func (t Toolchain) newTexinfo() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[Texinfo] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newTexinfo,
 
 		Name:        "texinfo",
@@ -497,15 +497,15 @@ func init() {
 		},
 
 		ID: 4958,
-	}
+	})
 }
 
-func (t Toolchain) newGperf() (pkg.Artifact, string) {
+func (t Toolchain) newGperf(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "3.3"
 		checksum = "RtIy9pPb_Bb8-31J2Nw-rRGso2JlS-lDlVhuNYhqR7Nt4xM_nObznxAlBMnarJv7"
 	)
-	return t.NewPackage("gperf", version, newTar(
+	return s.NewPackage(t, "gperf", version, newTar(
 		"https://ftpmirror.gnu.org/gperf/gperf-"+version+".tar.gz",
 		checksum,
 		pkg.TarGzip,
@@ -514,7 +514,7 @@ func (t Toolchain) newGperf() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[Gperf] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newGperf,
 
 		Name:        "gperf",
@@ -522,15 +522,15 @@ func init() {
 		Website:     "https://www.gnu.org/software/gperf/",
 
 		ID: 1237,
-	}
+	})
 }
 
-func (t Toolchain) newGawk() (pkg.Artifact, string) {
+func (t Toolchain) newGawk(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "5.4.0"
 		checksum = "m0RkIolC-PI7EY5q8pcx5Y-0twlIW0Yp3wXXmV-QaHorSdf8BhZ7kW9F8iWomz0C"
 	)
-	return t.NewPackage("gawk", version, newTar(
+	return s.NewPackage(t, "gawk", version, newTar(
 		"https://ftpmirror.gnu.org/gnu/gawk/gawk-"+version+".tar.gz",
 		checksum,
 		pkg.TarGzip,
@@ -542,7 +542,7 @@ func (t Toolchain) newGawk() (pkg.Artifact, string) {
 	}), version
 }
 func init() {
-	artifactsM[Gawk] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newGawk,
 
 		Name:        "gawk",
@@ -550,15 +550,15 @@ func init() {
 		Website:     "https://www.gnu.org/software/gawk/",
 
 		ID: 868,
-	}
+	})
 }
 
-func (t Toolchain) newGrep() (pkg.Artifact, string) {
+func (t Toolchain) newGrep(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "3.12"
 		checksum = "qMB4RjaPNRRYsxix6YOrjE8gyAT1zVSTy4nW4wKW9fqa0CHYAuWgPwDTirENzm_1"
 	)
-	return t.NewPackage("grep", version, newTar(
+	return s.NewPackage(t, "grep", version, newTar(
 		"https://ftpmirror.gnu.org/gnu/grep/grep-"+version+".tar.gz",
 		checksum,
 		pkg.TarGzip,
@@ -575,7 +575,7 @@ test_disable 'int main(){return 0;}' gnulib-tests/test-c32ispunct.c
 	), version
 }
 func init() {
-	artifactsM[Grep] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newGrep,
 
 		Name:        "grep",
@@ -583,15 +583,15 @@ func init() {
 		Website:     "https://www.gnu.org/software/grep/",
 
 		ID: 1251,
-	}
+	})
 }
 
-func (t Toolchain) newFindutils() (pkg.Artifact, string) {
+func (t Toolchain) newFindutils(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "4.10.0"
 		checksum = "ZXABdNBQXL7QjTygynRRTdXYWxQKZ0Wn5eMd3NUnxR0xaS0u0VfcKoTlbo50zxv6"
 	)
-	return t.NewPackage("findutils", version, pkg.NewHTTPGet(
+	return s.NewPackage(t, "findutils", version, pkg.NewHTTPGet(
 		nil, "https://ftpmirror.gnu.org/gnu/findutils/findutils-"+version+".tar.xz",
 		mustDecode(checksum),
 	), &PackageAttr{
@@ -606,7 +606,7 @@ echo 'int main(){return 0;}' > tests/xargs/test-sigusr.c
 	), version
 }
 func init() {
-	artifactsM[Findutils] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newFindutils,
 
 		Name:        "findutils",
@@ -614,15 +614,15 @@ func init() {
 		Website:     "https://www.gnu.org/software/findutils/",
 
 		ID: 812,
-	}
+	})
 }
 
-func (t Toolchain) newBC() (pkg.Artifact, string) {
+func (t Toolchain) newBC(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "1.08.2"
 		checksum = "8h6f3hjV80XiFs6v9HOPF2KEyg1kuOgn5eeFdVspV05ODBVQss-ey5glc8AmneLy"
 	)
-	return t.NewPackage("bc", version, newTar(
+	return s.NewPackage(t, "bc", version, newTar(
 		"https://ftpmirror.gnu.org/gnu/bc/bc-"+version+".tar.gz",
 		checksum,
 		pkg.TarGzip,
@@ -635,7 +635,7 @@ func (t Toolchain) newBC() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[BC] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newBC,
 
 		Name:        "bc",
@@ -643,22 +643,22 @@ func init() {
 		Website:     "https://www.gnu.org/software/bc/",
 
 		ID: 170,
-	}
+	})
 }
 
-func (t Toolchain) newLibiconv() (pkg.Artifact, string) {
+func (t Toolchain) newLibiconv(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "1.19"
 		checksum = "UibB6E23y4MksNqYmCCrA3zTFO6vJugD1DEDqqWYFZNuBsUWMVMcncb_5pPAr88x"
 	)
-	return t.NewPackage("libiconv", version, newTar(
+	return s.NewPackage(t, "libiconv", version, newTar(
 		"https://ftpmirror.gnu.org/gnu/libiconv/libiconv-"+version+".tar.gz",
 		checksum,
 		pkg.TarGzip,
 	), nil, (*MakeHelper)(nil)), version
 }
 func init() {
-	artifactsM[Libiconv] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newLibiconv,
 
 		Name:        "libiconv",
@@ -666,15 +666,15 @@ func init() {
 		Website:     "https://www.gnu.org/software/libiconv/",
 
 		ID: 10656,
-	}
+	})
 }
 
-func (t Toolchain) newTar() (pkg.Artifact, string) {
+func (t Toolchain) newTar(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "1.35"
 		checksum = "zSaoSlVUDW0dSfm4sbL4FrXLFR8U40Fh3zY5DWhR5NCIJ6GjU6Kc4VZo2-ZqpBRA"
 	)
-	return t.NewPackage("tar", version, newTar(
+	return s.NewPackage(t, "tar", version, newTar(
 		"https://ftpmirror.gnu.org/gnu/tar/tar-"+version+".tar.gz",
 		checksum,
 		pkg.TarGzip,
@@ -700,7 +700,7 @@ func (t Toolchain) newTar() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[Tar] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newTar,
 
 		Name:        "tar",
@@ -708,15 +708,15 @@ func init() {
 		Website:     "https://www.gnu.org/software/tar/",
 
 		ID: 4939,
-	}
+	})
 }
 
-func (t Toolchain) newParallel() (pkg.Artifact, string) {
+func (t Toolchain) newParallel(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "20260422"
 		checksum = "eTsepxgqhXpMEhPd55qh-W5y4vjKn0x9TD2mzbJCNZYtFf4lT4Wzoqr74HGJYBEH"
 	)
-	return t.NewPackage("parallel", version, newTar(
+	return s.NewPackage(t, "parallel", version, newTar(
 		"https://ftpmirror.gnu.org/gnu/parallel/parallel-"+version+".tar.bz2",
 		checksum,
 		pkg.TarBzip2,
@@ -730,7 +730,7 @@ ln -s ../system/bin/bash /bin/
 	), version
 }
 func init() {
-	artifactsM[Parallel] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newParallel,
 
 		Name:        "parallel",
@@ -742,15 +742,15 @@ func init() {
 		},
 
 		ID: 5448,
-	}
+	})
 }
 
-func (t Toolchain) newLibunistring() (pkg.Artifact, string) {
+func (t Toolchain) newLibunistring(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "1.4.2"
 		checksum = "iW9BbfLoVlXjWoLTZ4AekQSu4cFBnLcZ4W8OHWbv0AhJNgD3j65_zqaLMzFKylg2"
 	)
-	return t.NewPackage("libunistring", version, newTar(
+	return s.NewPackage(t, "libunistring", version, newTar(
 		"https://ftpmirror.gnu.org/gnu/libunistring/libunistring-"+version+".tar.gz",
 		checksum,
 		pkg.TarGzip,
@@ -767,7 +767,7 @@ test_disable 'int main(){return 0;}' tests/test-c32ispunct.c
 	), version
 }
 func init() {
-	artifactsM[Libunistring] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newLibunistring,
 
 		Name:        "libunistring",
@@ -775,22 +775,22 @@ func init() {
 		Website:     "https://www.gnu.org/software/libunistring/",
 
 		ID: 1747,
-	}
+	})
 }
 
-func (t Toolchain) newLibtasn1() (pkg.Artifact, string) {
+func (t Toolchain) newLibtasn1(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "4.21.0"
 		checksum = "9DYI3UYbfYLy8JsKUcY6f0irskbfL0fHZA91Q-JEOA3kiUwpodyjemRsYRjUpjuq"
 	)
-	return t.NewPackage("libtasn1", version, newTar(
+	return s.NewPackage(t, "libtasn1", version, newTar(
 		"https://ftpmirror.gnu.org/gnu/libtasn1/libtasn1-"+version+".tar.gz",
 		checksum,
 		pkg.TarGzip,
 	), nil, (*MakeHelper)(nil)), version
 }
 func init() {
-	artifactsM[Libtasn1] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newLibtasn1,
 
 		Name:        "libtasn1",
@@ -798,15 +798,15 @@ func init() {
 		Website:     "https://www.gnu.org/software/libtasn1/",
 
 		ID: 1734,
-	}
+	})
 }
 
-func (t Toolchain) newReadline() (pkg.Artifact, string) {
+func (t Toolchain) newReadline(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "8.3"
 		checksum = "r-lcGRJq_MvvBpOq47Z2Y1OI2iqrmtcqhTLVXR0xWo37ZpC2uT_md7gKq5o_qTMV"
 	)
-	return t.NewPackage("readline", version, newTar(
+	return s.NewPackage(t, "readline", version, newTar(
 		"https://ftpmirror.gnu.org/gnu/readline/readline-"+version+".tar.gz",
 		checksum,
 		pkg.TarGzip,
@@ -820,7 +820,7 @@ func (t Toolchain) newReadline() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[Readline] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newReadline,
 
 		Name:        "readline",
@@ -832,24 +832,24 @@ func init() {
 		},
 
 		ID: 4173,
-	}
+	})
 }
 
-func (t Toolchain) newGnuTLS() (pkg.Artifact, string) {
+func (t Toolchain) newGnuTLS(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "3.8.12"
 		checksum = "VPdP-nRydQQRJcnma-YA7CJYA_kzTJ2rb3QFeP6D27emSyInJ8sQ-Wzn518I38dl"
 	)
 
 	var configureExtra []KV
-	switch arch {
+	switch s.arch {
 	case "arm64":
 		configureExtra = []KV{
 			{"disable-hardware-acceleration"},
 		}
 	}
 
-	return t.NewPackage("gnutls", version, t.newTagRemote(
+	return s.NewPackage(t, "gnutls", version, s.newTagRemote(t,
 		"https://gitlab.com/gnutls/gnutls.git",
 		version, checksum,
 	), &PackageAttr{
@@ -997,7 +997,7 @@ index 1b78b8cf1..350156a86 100644
 	), version
 }
 func init() {
-	artifactsM[GnuTLS] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newGnuTLS,
 
 		Name:        "gnutls",
@@ -1013,15 +1013,15 @@ func init() {
 		},
 
 		ID: 1221,
-	}
+	})
 }
 
-func (t Toolchain) newBinutils() (pkg.Artifact, string) {
+func (t Toolchain) newBinutils(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "2.46.0"
 		checksum = "4kK1_EXQipxSqqyvwD4LbiMLFKCUApjq6PeG4XJP4dzxYGqDeqXfh8zLuTyOuOVR"
 	)
-	return t.NewPackage("binutils", version, newTar(
+	return s.NewPackage(t, "binutils", version, newTar(
 		"https://ftpmirror.gnu.org/gnu/binutils/binutils-"+version+".tar.bz2",
 		checksum,
 		pkg.TarBzip2,
@@ -1030,7 +1030,7 @@ func (t Toolchain) newBinutils() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[Binutils] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newBinutils,
 
 		Name:        "binutils",
@@ -1038,15 +1038,15 @@ func init() {
 		Website:     "https://www.gnu.org/software/binutils/",
 
 		ID: 7981,
-	}
+	})
 }
 
-func (t Toolchain) newGMP() (pkg.Artifact, string) {
+func (t Toolchain) newGMP(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "6.3.0"
 		checksum = "yrgbgEDWKDdMWVHh7gPbVl56-sRtVVhfvv0M_LX7xMUUk_mvZ1QOJEAnt7g4i3k5"
 	)
-	return t.NewPackage("gmp", version, newTar(
+	return s.NewPackage(t, "gmp", version, newTar(
 		"https://gcc.gnu.org/pub/gcc/infrastructure/"+
 			"gmp-"+version+".tar.bz2",
 		checksum,
@@ -1060,7 +1060,7 @@ func (t Toolchain) newGMP() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[GMP] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newGMP,
 
 		Name:        "gmp",
@@ -1068,15 +1068,15 @@ func init() {
 		Website:     "https://gmplib.org/",
 
 		ID: 1186,
-	}
+	})
 }
 
-func (t Toolchain) newMPFR() (pkg.Artifact, string) {
+func (t Toolchain) newMPFR(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "4.2.2"
 		checksum = "wN3gx0zfIuCn9r3VAn_9bmfvAYILwrRfgBjYSD1IjLqyLrLojNN5vKyQuTE9kA-B"
 	)
-	return t.NewPackage("mpfr", version, newTar(
+	return s.NewPackage(t, "mpfr", version, newTar(
 		"https://gcc.gnu.org/pub/gcc/infrastructure/"+
 			"mpfr-"+version+".tar.bz2",
 		checksum,
@@ -1086,7 +1086,7 @@ func (t Toolchain) newMPFR() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[MPFR] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newMPFR,
 
 		Name:        "mpfr",
@@ -1098,15 +1098,15 @@ func init() {
 		},
 
 		ID: 2019,
-	}
+	})
 }
 
-func (t Toolchain) newMPC() (pkg.Artifact, string) {
+func (t Toolchain) newMPC(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "1.4.1"
 		checksum = "ZffaZyWkvIw0iPvRe5EJ7O-VvHtSkbbb3K_7SgPtK810NvGan7nbF0T5-6tozjQN"
 	)
-	return t.NewPackage("mpc", version, newFromGitLab(
+	return s.NewPackage(t, "mpc", version, newFromGitLab(
 		"gitlab.inria.fr",
 		"mpc/mpc",
 		version, checksum,
@@ -1125,7 +1125,7 @@ func (t Toolchain) newMPC() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[MPC] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newMPC,
 
 		Name:        "mpc",
@@ -1137,22 +1137,22 @@ func init() {
 		},
 
 		ID: 1667,
-	}
+	})
 }
 
-func (t Toolchain) newGCC() (pkg.Artifact, string) {
+func (t Toolchain) newGCC(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "16.1.0"
 		checksum = "4ASoWbxaA2FW7PAB0zzHDPC5XnNhyaAyjtDPpGzceSLeYnEIXsNYZR3PA_Zu5P0K"
 	)
 
 	var configureExtra []KV
-	switch arch {
+	switch s.arch {
 	case "amd64", "arm64":
 		configureExtra = append(configureExtra, KV{"with-multilib-list", "''"})
 	}
 
-	return t.NewPackage("gcc", version, newTar(
+	return s.NewPackage(t, "gcc", version, newTar(
 		"https://ftp.tsukuba.wide.ad.jp/software/gcc/releases/"+
 			"gcc-"+version+"/gcc-"+version+".tar.gz",
 		checksum,
@@ -1346,7 +1346,7 @@ ln -s system/lib /work/
 	), version
 }
 func init() {
-	artifactsM[gcc] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newGCC,
 
 		Name:        "gcc",
@@ -1362,5 +1362,5 @@ func init() {
 		},
 
 		ID: 6502,
-	}
+	})
 }