security/hakurei
6
3
Fork 1
Code Issues 11 Pull Requests 1 Actions 2 Packages Projects Releases 14 Wiki Activity

internal/rosa/make: migrate to helper interface
All checks were successful
Test / Create distribution (push) Successful in 1m8s
Details
Test / Sandbox (push) Successful in 2m55s
Details
Test / Hakurei (push) Successful in 5m3s
Details
Test / ShareFS (push) Successful in 5m13s
Details
Test / Hpkg (push) Successful in 5m56s
Details
Test / Hakurei (race detector) (push) Successful in 6m18s
Details
Test / Sandbox (race detector) (push) Successful in 2m37s
Details
Test / Flake checks (push) Successful in 1m43s
Details

Browse Source 
This also updates all affected artifacts to use new behaviour.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
Ophestra
2026-03-01 23:54:40 +09:00
parent 9deaf853f0
commit cc60e0d15d
41 changed files with 698 additions and 740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
internal/rosa/x.go
View File

@@ -7,12 +7,12 @@ func (t Toolchain) newUtilMacros() pkg.Artifact {
version = "1.17"
checksum = "vYPO4Qq3B_WGcsBjG0-lfwZ6DZ7ayyrOLqfDrVOgTDcyLChuMGOAAVAa_UXLu5tD"
)
return t.NewViaMake("util-macros", version, pkg.NewHTTPGetTar(
return t.NewPackage("util-macros", version, pkg.NewHTTPGetTar(
nil, "https://www.x.org/releases/X11R7.7/src/util/"+
"util-macros-"+version+".tar.bz2",
mustDecode(checksum),
pkg.TarBzip2,
), nil)
), nil, (*MakeHelper)(nil))
}
func init() { artifactsF[utilMacros] = Toolchain.newUtilMacros }
@@ -21,27 +21,22 @@ func (t Toolchain) newXproto() pkg.Artifact {
version = "7.0.23"
checksum = "goxwWxV0jZ_3pNczXFltZWHAhq92x-aEreUGyp5Ns8dBOoOmgbpeNIu1nv0Zx07z"
)
return t.NewViaMake("xproto", version, pkg.NewHTTPGetTar(
return t.NewPackage("xproto", version, pkg.NewHTTPGetTar(
nil, "https://www.x.org/releases/X11R7.7/src/proto/"+
"xproto-"+version+".tar.bz2",
mustDecode(checksum),
pkg.TarBzip2,
), &MakeAttr{
Writable: true,
), nil, &MakeHelper{
// ancient configure script
ScriptEarly: `
cd /usr/src/xproto
autoreconf -if
`,
Generate: "autoreconf -if",
},
t.Load(M4),
t.Load(Perl),
t.Load(Autoconf),
t.Load(Automake),
t.Load(PkgConfig),
M4,
Perl,
Autoconf,
Automake,
PkgConfig,
t.Load(utilMacros),
utilMacros,
)
}
func init() { artifactsF[Xproto] = Toolchain.newXproto }
@@ -51,29 +46,24 @@ func (t Toolchain) newLibXau() pkg.Artifact {
version = "1.0.7"
checksum = "bm768RoZZnHRe9VjNU1Dw3BhfE60DyS9D_bgSR-JLkEEyUWT_Hb_lQripxrXto8j"
)
return t.NewViaMake("libXau", version, pkg.NewHTTPGetTar(
return t.NewPackage("libXau", version, pkg.NewHTTPGetTar(
nil, "https://www.x.org/releases/X11R7.7/src/lib/"+
"libXau-"+version+".tar.bz2",
mustDecode(checksum),
pkg.TarBzip2,
), &MakeAttr{
Writable: true,
), nil, &MakeHelper{
// ancient configure script
ScriptEarly: `
cd /usr/src/libXau
autoreconf -if
`,
Generate: "autoreconf -if",
},
t.Load(M4),
t.Load(Perl),
t.Load(Autoconf),
t.Load(Automake),
t.Load(Libtool),
t.Load(PkgConfig),
M4,
Perl,
Autoconf,
Automake,
Libtool,
PkgConfig,
t.Load(utilMacros),
t.Load(Xproto),
utilMacros,
Xproto,
)
}
func init() { artifactsF[LibXau] = Toolchain.newLibXau }