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, 22 insertions, 21 deletions

diff --git a/internal/rosa/ssl.go b/internal/rosa/ssl.go
index 28b01971..1e57cc7f 100644
--- a/internal/rosa/ssl.go
+++ b/internal/rosa/ssl.go
@@ -12,14 +12,12 @@ func (t Toolchain) newNSS() pkg.Artifact {
 		version0  = "4_38_2"
 		checksum0 = "25x2uJeQnOHIiq_zj17b4sYqKgeoU8-IsySUptoPcdHZ52PohFZfGuIisBreWzx0"
 	)
-	return t.NewViaMake("nss", version, t.NewPatchedSource(
-		"nss", version, pkg.NewHTTPGetTar(
-			nil, "https://github.com/nss-dev/nss/archive/refs/tags/"+
-				"NSS_"+version+"_RTM.tar.gz",
-			mustDecode(checksum),
-			pkg.TarGzip,
-		), false,
-	), &MakeAttr{
+	return t.NewPackage("nss", version, pkg.NewHTTPGetTar(
+		nil, "https://github.com/nss-dev/nss/archive/refs/tags/"+
+			"NSS_"+version+"_RTM.tar.gz",
+		mustDecode(checksum),
+		pkg.TarGzip,
+	), &PackageAttr{
 		Paths: []pkg.ExecPath{
 			pkg.Path(AbsUsrSrc.Append("nspr.zip"), false, pkg.NewHTTPGet(
 				nil, "https://hg-edge.mozilla.org/projects/nspr/archive/"+
@@ -28,16 +26,19 @@ func (t Toolchain) newNSS() pkg.Artifact {
 			)),
 		},
 
-		Writable:      true,
-		OmitDefaults:  true,
-		SkipConfigure: true,
-		InPlace:       true,
+		// uses source tree as scratch space
+		Writable: true,
+		Chmod:    true,
 
 		ScriptEarly: `
 unzip /usr/src/nspr.zip -d /usr/src
 mv '/usr/src/nspr-NSPR_` + version0 + `_RTM' /usr/src/nspr
-cd /usr/src/nss
 `,
+	}, &MakeHelper{
+		OmitDefaults:  true,
+		SkipConfigure: true,
+		InPlace:       true,
+
 		SkipCheck: true,
 		Make: []string{
 			"CCC=clang++",
@@ -46,7 +47,7 @@ cd /usr/src/nss
 			"USE_64=1",
 			"nss_build_all",
 		},
-		ScriptInstall: `
+		Install: `
 mkdir -p /work/system/nss
 cp -r \
 	/usr/src/dist/. \
@@ -54,14 +55,14 @@ cp -r \
 	/work/system/nss
 `,
 	},
-		t.Load(Perl),
-		t.Load(Python),
-		t.Load(Unzip),
-		t.Load(Gawk),
-		t.Load(Coreutils),
+		Perl,
+		Python,
+		Unzip,
+		Gawk,
+		Coreutils,
 
-		t.Load(Zlib),
-		t.Load(KernelHeaders),
+		Zlib,
+		KernelHeaders,
 	)
 }
 func init() { artifactsF[NSS] = Toolchain.newNSS }