From d7a3706db3c9de9200054f4b3635436682f3e6dd Mon Sep 17 00:00:00 2001 From: Ophestra Date: Mon, 2 Feb 2026 19:57:39 +0900 Subject: [PATCH] internal/rosa/x: regenerate build system These come with 16-year-old scripts that do not understand aarch64 or really anything else relevant to Rosa OS. Signed-off-by: Ophestra --- internal/rosa/all.go | 1 + internal/rosa/x.go | 46 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/internal/rosa/all.go b/internal/rosa/all.go index a8c1e96..2b0727c 100644 --- a/internal/rosa/all.go +++ b/internal/rosa/all.go @@ -58,6 +58,7 @@ const ( Setuptools Toybox toyboxEarly + utilMacros Wayland WaylandProtocols XCB diff --git a/internal/rosa/x.go b/internal/rosa/x.go index 5cf5b06..19777bd 100644 --- a/internal/rosa/x.go +++ b/internal/rosa/x.go @@ -2,6 +2,20 @@ package rosa import "hakurei.app/internal/pkg" +func (t Toolchain) newUtilMacros() pkg.Artifact { + const ( + version = "1.17" + checksum = "vYPO4Qq3B_WGcsBjG0-lfwZ6DZ7ayyrOLqfDrVOgTDcyLChuMGOAAVAa_UXLu5tD" + ) + return t.NewViaMake("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) +} +func init() { artifactsF[utilMacros] = Toolchain.newUtilMacros } + func (t Toolchain) newXproto() pkg.Artifact { const ( version = "7.0.23" @@ -13,10 +27,21 @@ func (t Toolchain) newXproto() pkg.Artifact { mustDecode(checksum), pkg.TarBzip2, ), &MakeAttr{ - // buggy configure script - Build: `""`, + Writable: true, + + // ancient configure script + ScriptEarly: ` +cd /usr/src/xproto +autoreconf -if +`, }, + t.Load(M4), + t.Load(Perl), + t.Load(Autoconf), + t.Load(Automake), t.Load(PkgConfig), + + t.Load(utilMacros), ) } func init() { artifactsF[Xproto] = Toolchain.newXproto } @@ -32,15 +57,26 @@ func (t Toolchain) newLibXau() pkg.Artifact { mustDecode(checksum), pkg.TarBzip2, ), &MakeAttr{ + Writable: true, + + // ancient configure script + ScriptEarly: ` +cd /usr/src/libXau +autoreconf -if +`, + Configure: [][2]string{ {"enable-static"}, }, - - // buggy configure script - Build: `""`, }, + t.Load(M4), + t.Load(Perl), + t.Load(Autoconf), + t.Load(Automake), + t.Load(Libtool), t.Load(PkgConfig), + t.Load(utilMacros), t.Load(Xproto), ) }