internal/rosa/make: migrate to helper interface

This also updates all affected artifacts to use new behaviour.

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

1 files changed, 12 insertions, 12 deletions

diff --git a/internal/rosa/elfutils.go b/internal/rosa/elfutils.go
index ea9dcb67..5c47ebae 100644
--- a/internal/rosa/elfutils.go
+++ b/internal/rosa/elfutils.go
@@ -7,18 +7,18 @@ func (t Toolchain) newElfutils() pkg.Artifact {
 		version  = "0.194"
 		checksum = "Q3XUygUPv9vR1TkWucwUsQ8Kb1_F6gzk-KMPELr3cC_4AcTrprhVPMvN0CKkiYRa"
 	)
-	return t.NewViaMake("elfutils", version, pkg.NewHTTPGetTar(
+	return t.NewPackage("elfutils", version, pkg.NewHTTPGetTar(
 		nil, "https://sourceware.org/elfutils/ftp/"+
 			version+"/elfutils-"+version+".tar.bz2",
 		mustDecode(checksum),
 		pkg.TarBzip2,
-	), &MakeAttr{
+	), &PackageAttr{
 		Env: []string{
 			"CC=cc" +
 				// nonstandard glibc extension
 				" -DFNM_EXTMATCH=0",
 		},
-
+	}, &MakeHelper{
 		// nonstandard glibc extension
 		SkipCheck: true,
 
@@ -26,16 +26,16 @@ func (t Toolchain) newElfutils() pkg.Artifact {
 			{"enable-deterministic-archives"},
 		},
 	},
-		t.Load(M4),
-		t.Load(PkgConfig),
+		M4,
+		PkgConfig,
 
-		t.Load(Zlib),
-		t.Load(Bzip2),
-		t.Load(Zstd),
-		t.Load(ArgpStandalone),
-		t.Load(MuslFts),
-		t.Load(MuslObstack),
-		t.Load(KernelHeaders),
+		Zlib,
+		Bzip2,
+		Zstd,
+		ArgpStandalone,
+		MuslFts,
+		MuslObstack,
+		KernelHeaders,
 	)
 }
 func init() { artifactsF[Elfutils] = Toolchain.newElfutils }