diff options
Diffstat (limited to 'internal/rosa/xcb.go')
| -rw-r--r-- | internal/rosa/xcb.go | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/internal/rosa/xcb.go b/internal/rosa/xcb.go index 3f0e3671..b659cf2e 100644 --- a/internal/rosa/xcb.go +++ b/internal/rosa/xcb.go @@ -12,8 +12,6 @@ func (t Toolchain) newXCBProto() pkg.Artifact { mustDecode(checksum), pkg.TarGzip, ), &MakeAttr{ - Writable: true, - Configure: [][2]string{ {"enable-static"}, }, @@ -28,28 +26,21 @@ func (t Toolchain) newXCB() pkg.Artifact { version = "1.17.0" checksum = "hjjsc79LpWM_hZjNWbDDS6qRQUXREjjekS6UbUsDq-RR1_AjgNDxhRvZf-1_kzDd" ) - return t.New("xcb-"+version, 0, []pkg.Artifact{ - t.Load(Make), - t.Load(Gawk), - t.Load(Coreutils), + return t.NewViaMake("xcb", version, pkg.NewHTTPGetTar( + nil, "https://xcb.freedesktop.org/dist/libxcb-"+version+".tar.gz", + mustDecode(checksum), + pkg.TarGzip, + ), &MakeAttr{ + Configure: [][2]string{ + {"enable-static"}, + }, + }, t.Load(Python), t.Load(PkgConfig), t.Load(XCBProto), t.Load(Xproto), t.Load(LibXau), - }, nil, nil, ` -cd "$(mktemp -d)" -/usr/src/xcb/configure \ - --prefix=/system \ - --build="${ROSA_TRIPLE}" \ - --enable-static -make "-j$(nproc)" check -make DESTDIR=/work install -`, pkg.Path(AbsUsrSrc.Append("xcb"), true, pkg.NewHTTPGetTar( - nil, "https://xcb.freedesktop.org/dist/libxcb-"+version+".tar.gz", - mustDecode(checksum), - pkg.TarGzip, - ))) + ) } func init() { artifactsF[XCB] = Toolchain.newXCB } |