internal/rosa: migrate to make helper

This migrates artifacts that the helper cannot produce an identical instance of.

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

1 files changed, 22 insertions, 31 deletions

diff --git a/internal/rosa/x.go b/internal/rosa/x.go
index 19f3ee68..5cf5b066 100644
--- a/internal/rosa/x.go
+++ b/internal/rosa/x.go
@@ -7,23 +7,17 @@ func (t Toolchain) newXproto() pkg.Artifact {
 		version  = "7.0.23"
 		checksum = "goxwWxV0jZ_3pNczXFltZWHAhq92x-aEreUGyp5Ns8dBOoOmgbpeNIu1nv0Zx07z"
 	)
-	return t.New("xproto-"+version, 0, []pkg.Artifact{
-		t.Load(Make),
-		t.Load(Gawk),
-		t.Load(Coreutils),
-		t.Load(PkgConfig),
-	}, nil, nil, `
-cd "$(mktemp -d)"
-/usr/src/xproto/configure \
-	--prefix=/system \
-	--enable-static
-make "-j$(nproc)" check
-make DESTDIR=/work install
-`, pkg.Path(AbsUsrSrc.Append("xproto"), true, pkg.NewHTTPGetTar(
-		nil, "https://www.x.org/releases/X11R7.7/src/proto/xproto-"+version+".tar.bz2",
+	return t.NewViaMake("xproto", version, pkg.NewHTTPGetTar(
+		nil, "https://www.x.org/releases/X11R7.7/src/proto/"+
+			"xproto-"+version+".tar.bz2",
 		mustDecode(checksum),
 		pkg.TarBzip2,
-	)))
+	), &MakeAttr{
+		// buggy configure script
+		Build: `""`,
+	},
+		t.Load(PkgConfig),
+	)
 }
 func init() { artifactsF[Xproto] = Toolchain.newXproto }
 
@@ -32,25 +26,22 @@ func (t Toolchain) newLibXau() pkg.Artifact {
 		version  = "1.0.7"
 		checksum = "bm768RoZZnHRe9VjNU1Dw3BhfE60DyS9D_bgSR-JLkEEyUWT_Hb_lQripxrXto8j"
 	)
-	return t.New("libXau-"+version, 0, []pkg.Artifact{
-		t.Load(Make),
-		t.Load(Gawk),
-		t.Load(Coreutils),
-		t.Load(PkgConfig),
-
-		t.Load(Xproto),
-	}, nil, nil, `
-cd "$(mktemp -d)"
-/usr/src/libXau/configure \
-	--prefix=/system \
-	--enable-static
-make "-j$(nproc)" check
-make DESTDIR=/work install
-`, pkg.Path(AbsUsrSrc.Append("libXau"), true, pkg.NewHTTPGetTar(
+	return t.NewViaMake("libXau", version, pkg.NewHTTPGetTar(
 		nil, "https://www.x.org/releases/X11R7.7/src/lib/"+
 			"libXau-"+version+".tar.bz2",
 		mustDecode(checksum),
 		pkg.TarBzip2,
-	)))
+	), &MakeAttr{
+		Configure: [][2]string{
+			{"enable-static"},
+		},
+
+		// buggy configure script
+		Build: `""`,
+	},
+		t.Load(PkgConfig),
+
+		t.Load(Xproto),
+	)
 }
 func init() { artifactsF[LibXau] = Toolchain.newLibXau }