aboutsummaryrefslogtreecommitdiffhomepage
path: root/internal/rosa/xcb.go
diff options
context:
space:
mode:
Diffstat (limited to 'internal/rosa/xcb.go')
-rw-r--r--internal/rosa/xcb.go25
1 files changed, 10 insertions, 15 deletions
diff --git a/internal/rosa/xcb.go b/internal/rosa/xcb.go
index 134f5d2f..3f0e3671 100644
--- a/internal/rosa/xcb.go
+++ b/internal/rosa/xcb.go
@@ -7,24 +7,19 @@ func (t Toolchain) newXCBProto() pkg.Artifact {
version = "1.17.0"
checksum = "_NtbKaJ_iyT7XiJz25mXQ7y-niTzE8sHPvLXZPcqtNoV_-vTzqkezJ8Hp2U1enCv"
)
- return t.New("xcb-proto-"+version, 0, []pkg.Artifact{
- t.Load(Make),
- t.Load(Gawk),
- t.Load(Coreutils),
- t.Load(Python),
- }, nil, nil, `
-cd "$(mktemp -d)"
-/usr/src/xcb-proto/configure \
- --prefix=/system \
- --build="${ROSA_TRIPLE}" \
- --enable-static
-make "-j$(nproc)" check
-make DESTDIR=/work install
-`, pkg.Path(AbsUsrSrc.Append("xcb-proto"), true, pkg.NewHTTPGetTar(
+ return t.NewViaMake("xcb-proto", version, pkg.NewHTTPGetTar(
nil, "https://xcb.freedesktop.org/dist/xcb-proto-"+version+".tar.gz",
mustDecode(checksum),
pkg.TarGzip,
- )))
+ ), &MakeAttr{
+ Writable: true,
+
+ Configure: [][2]string{
+ {"enable-static"},
+ },
+ },
+ t.Load(Python),
+ )
}
func init() { artifactsF[XCBProto] = Toolchain.newXCBProto }