internal/rosa/llvm: enable LLVM_BUILD_TESTS

This arranges for tests to be built early, and is more efficient towards the end of the build.

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

cmd/mbf/main.go

@@ -471,6 +471,9 @@ func main() {
 			flagExport  string
 			flagRemote  bool
 			flagNoReply bool
+
+			flagBoot bool
+			flagStd  bool
 		)
 		c.NewCommand(
 			"cure",
@@ -484,11 +487,18 @@ func main() {
 					return fmt.Errorf("unknown artifact %q", args[0])
 				}
 
+				t := rosa.Std
+				if flagBoot {
+					t -= 2
+				} else if flagStd {
+					t -= 1
+				}
+
 				switch {
 				default:
 					var pathname *check.Absolute
 					err := cm.Do(func(cache *pkg.Cache) (err error) {
-						pathname, _, err = cache.Cure(rosa.Std.Load(p))
+						pathname, _, err = cache.Cure(t.Load(p))
 						return
 					})
 					if err != nil {
@@ -541,7 +551,7 @@ func main() {
 					return cm.Do(func(cache *pkg.Cache) error {
 						return cache.EnterExec(
 							ctx,
-							rosa.Std.Load(p),
+							t.Load(p),
 							true, os.Stdin, os.Stdout, os.Stderr,
 							rosa.AbsSystem.Append("bin", "mksh"),
 							"sh",
@@ -553,7 +563,7 @@ func main() {
 					if flagNoReply {
 						flags |= remoteNoReply
 					}
-					a := rosa.Std.Load(p)
+					a := t.Load(p)
 					pathname, err := cureRemote(ctx, &addr, a, flags)
 					if !flagNoReply && err == nil {
 						log.Println(pathname)
@@ -591,6 +601,14 @@ func main() {
 			&flagNoReply,
 			"no-reply", command.BoolFlag(false),
 			"Do not receive a reply from the daemon",
+		).Flag(
+			&flagBoot,
+			"boot", command.BoolFlag(false),
+			"Build on the stage0 toolchain",
+		).Flag(
+			&flagStd,
+			"std", command.BoolFlag(false),
+			"Build on the intermediate toolchain",
 		)
 	}
 

container/errors.go

@@ -118,6 +118,10 @@ func errnoFallback(op, path string, err error) (syscall.Errno, *os.PathError) {
 
 // mount wraps syscall.Mount for error handling.
 func mount(source, target, fstype string, flags uintptr, data string) error {
+	if max(len(source), len(target), len(data))+1 > os.Getpagesize() {
+		return &MountError{source, target, fstype, flags, data, syscall.ENOMEM}
+	}
+
 	err := syscall.Mount(source, target, fstype, flags, data)
 	if err == nil {
 		return nil

internal/rosa/all.go

@@ -72,7 +72,10 @@ const (
 	HakureiDist
 	IPTables
 	Kmod
+	LIT
+	LibX11
 	LibXau
+	LibXext
 	Libbsd
 	Libcap
 	Libdrm
@@ -92,8 +95,10 @@ const (
 	Libtool
 	Libucontext
 	Libunistring
+	Libxshmfence
 	Libxml2
 	Libxslt
+	Libxtrans
 	M4
 	MPC
 	MPFR
@@ -148,6 +153,7 @@ const (
 	Rsync
 	Sed
 	SPIRVHeaders
+	SPIRVLLVMTranslator
 	SPIRVTools
 	SquashfsTools
 	Strace
@@ -164,14 +170,27 @@ const (
 	XCBProto
 	XDGDBusProxy
 	XZ
-	Xproto
+	XorgProto
 	Zlib
 	Zstd
 
 	// PresetUnexportedStart is the first unexported preset.
 	PresetUnexportedStart
 
-	buildcatrust = iota - 1
+	llvmSource = iota - 1
+	// earlyCompilerRT is an early, standalone compiler-rt installation for the
+	// standalone runtimes build.
+	//
+	// earlyCompilerRT must only be loaded by [LLVM].
+	earlyCompilerRT
+	// earlyRuntimes is an early, standalone installation of LLVM runtimes to
+	// work around the cmake build system leaking the system LLVM installation
+	// when invoking the newly built toolchain.
+	//
+	// earlyRuntimes must only be loaded by [LLVM].
+	earlyRuntimes
+
+	buildcatrust
 	utilMacros
 
 	// Musl is a standalone libc that does not depend on the toolchain.

internal/rosa/cmake.go

@@ -122,6 +122,8 @@ type CMakeHelper struct {
 	// Path elements joined with source.
 	Append []string
 
+	// Value of CMAKE_BUILD_TYPE. The zero value is equivalent to "Release".
+	BuildType string
 	// CMake CACHE entries.
 	Cache []KV
 	// Runs after install.
@@ -164,14 +166,7 @@ func (*CMakeHelper) wantsDir() string { return "/cure/" }
 // script generates the cure script.
 func (attr *CMakeHelper) script(name string) string {
 	if attr == nil {
-		attr = &CMakeHelper{
-			Cache: []KV{
-				{"CMAKE_BUILD_TYPE", "Release"},
-			},
-		}
-	}
-	if len(attr.Cache) == 0 {
-		panic("CACHE must be non-empty")
+		attr = new(CMakeHelper)
 	}
 
 	generate := "Ninja"
@@ -189,6 +184,13 @@ func (attr *CMakeHelper) script(name string) string {
 		script += "\n" + test
 	}
 
+	cache := make([]KV, 1, 1+len(attr.Cache))
+	cache[0] = KV{"CMAKE_BUILD_TYPE", "Release"}
+	if attr.BuildType != "" {
+		cache[0][1] = attr.BuildType
+	}
+	cache = append(cache, attr.Cache...)
+
 	return `
 cmake -G ` + generate + ` \
 	-DCMAKE_C_COMPILER_TARGET="${ROSA_TRIPLE}" \
@@ -196,7 +198,7 @@ cmake -G ` + generate + ` \
 	-DCMAKE_ASM_COMPILER_TARGET="${ROSA_TRIPLE}" \
 	-DCMAKE_INSTALL_LIBDIR=lib \
 	` + strings.Join(slices.Collect(func(yield func(string) bool) {
-		for _, v := range attr.Cache {
+		for _, v := range cache {
 			if !yield("-D" + v[0] + "=" + v[1]) {
 				return
 			}

internal/rosa/glslang.go

@@ -17,10 +17,6 @@ func (t Toolchain) newSPIRVHeaders() (pkg.Artifact, string) {
 		"vulkan-sdk-"+version,
 		checksum,
 	), nil, &CMakeHelper{
-		Cache: []KV{
-			{"CMAKE_BUILD_TYPE", "Release"},
-		},
-
 		// upstream has no tests
 		SkipTest: true,
 	}), version
@@ -67,7 +63,6 @@ func (t Toolchain) newSPIRVTools() (pkg.Artifact, string) {
 		checksum,
 	), nil, &CMakeHelper{
 		Cache: []KV{
-			{"CMAKE_BUILD_TYPE", "Release"},
 			{"SPIRV-Headers_SOURCE_DIR", "/system"},
 		},
 	},
@@ -109,7 +104,6 @@ func (t Toolchain) newGlslang() (pkg.Artifact, string) {
 		Chmod:    true,
 	}, &CMakeHelper{
 		Cache: []KV{
-			{"CMAKE_BUILD_TYPE", "Release"},
 			{"BUILD_SHARED_LIBS", "ON"},
 			{"ALLOW_EXTERNAL_SPIRV_TOOLS", "ON"},
 		},
@@ -132,3 +126,65 @@ func init() {
 		ID: 205796,
 	}
 }
+
+func (t Toolchain) newSPIRVLLVMTranslator() (pkg.Artifact, string) {
+	const (
+		version  = "22.1.2"
+		checksum = "JZAaV5ewYcm-35YA_U2BM2IcsQouZtX1BLZR0zh2vSlfEXMsT5OCtY4Gh5RJkcGy"
+	)
+	return t.NewPackage("spirv-llvm-translator", version, newFromGitHub(
+		"KhronosGroup/SPIRV-LLVM-Translator",
+		"v"+version, checksum,
+	), &PackageAttr{
+		Patches: []KV{
+			{"remove-early-prefix", `diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c000a77e..86f79b03 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -172,5 +172,5 @@ install(
+   FILES
+     ${CMAKE_BINARY_DIR}/LLVMSPIRVLib.pc
+   DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}/pkgconfig
++    lib${LLVM_LIBDIR_SUFFIX}/pkgconfig
+ )
+`},
+		},
+
+		// litArgs emits shell syntax
+		ScriptEarly: `
+export LIT_OPTS=` + litArgs(true,
+			// error: line 13: OpTypeCooperativeMatrixKHR Scope is limited to Workgroup and Subgroup
+			"cooperative_matrix_constant_null.spvasm") + `
+`,
+	}, &CMakeHelper{
+		Cache: []KV{
+			{"CMAKE_SKIP_BUILD_RPATH", "ON"},
+			{"BUILD_SHARED_LIBS", "ON"},
+			{"LLVM_SPIRV_ENABLE_LIBSPIRV_DIS", "ON"},
+			{"LLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR", "/system"},
+			{"LLVM_EXTERNAL_LIT", "/system/bin/lit"},
+			{"LLVM_INCLUDE_TESTS", "ON"},
+		},
+	},
+		Bash,
+		LIT,
+
+		SPIRVTools,
+	), version
+}
+func init() {
+	artifactsM[SPIRVLLVMTranslator] = Metadata{
+		f: Toolchain.newSPIRVLLVMTranslator,
+
+		Name:        "spirv-llvm-translator",
+		Description: "bi-directional translation between SPIR-V and LLVM IR",
+		Website:     "https://github.com/KhronosGroup/SPIRV-LLVM-Translator",
+
+		Dependencies: P{
+			SPIRVTools,
+		},
+
+		ID: 227273,
+	}
+}

internal/rosa/llvm.go

@@ -2,20 +2,157 @@ package rosa
 
 import (
 	"regexp"
+	"runtime"
+	"slices"
 	"strings"
 
 	"hakurei.app/internal/pkg"
 )
 
+// litArgs returns [LIT] arguments for optional verbosity and check skipping.
+func litArgs(verbose bool, skipChecks ...string) string {
+	args := []string{"-sv"}
+	if verbose {
+		args[0] = "--verbose"
+	}
+
+	if len(skipChecks) > 0 {
+		skipChecks = slices.Clone(skipChecks)
+		for i, s := range skipChecks {
+			s = regexp.QuoteMeta(s)
+			s = strings.ReplaceAll(s, "/", "\\/")
+			skipChecks[i] = s
+		}
+		args = append(args,
+			"--filter-out='\\''"+strings.Join(skipChecks, "|")+"'\\''")
+	}
+
+	return "'" + strings.Join(args, " ") + "'"
+}
+
+func (t Toolchain) newEarlyCompilerRT() (pkg.Artifact, string) {
+	version := t.Version(llvmSource)
+	major, _, _ := strings.Cut(version, ".")
+	return t.NewPackage("early-compiler-rt", version, t.Load(llvmSource), &PackageAttr{
+		Flag: TExclusive,
+	}, &CMakeHelper{
+		Append: []string{"compiler-rt"},
+
+		Cache: []KV{
+			// libc++ not yet available
+			{"CMAKE_CXX_COMPILER_TARGET", ""},
+
+			{"LLVM_HOST_TRIPLE", `"${ROSA_TRIPLE}"`},
+			{"LLVM_DEFAULT_TARGET_TRIPLE", `"${ROSA_TRIPLE}"`},
+			{"LLVM_ENABLE_PER_TARGET_RUNTIME_DIR", "ON"},
+
+			{"COMPILER_RT_BUILD_BUILTINS", "ON"},
+			{"COMPILER_RT_DEFAULT_TARGET_ONLY", "OFF"},
+			{"COMPILER_RT_SANITIZERS_TO_BUILD", "asan"},
+
+			// does not work without libunwind
+			{"COMPILER_RT_BUILD_CTX_PROFILE", "OFF"},
+			{"COMPILER_RT_BUILD_LIBFUZZER", "OFF"},
+			{"COMPILER_RT_BUILD_MEMPROF", "OFF"},
+			{"COMPILER_RT_BUILD_PROFILE", "OFF"},
+			{"COMPILER_RT_BUILD_XRAY", "OFF"},
+		},
+		SkipTest: true,
+		Script: `
+mkdir -p "/work/system/lib/clang/` + major + `/lib/"
+ln -s \
+	"../../../${ROSA_TRIPLE}" \
+	"/work/system/lib/clang/` + major + `/lib/"
+
+ln -s \
+	"clang_rt.crtbegin-` + linuxArch() + `.o" \
+	"/work/system/lib/${ROSA_TRIPLE}/crtbeginS.o"
+ln -s \
+	"clang_rt.crtend-` + linuxArch() + `.o" \
+	"/work/system/lib/${ROSA_TRIPLE}/crtendS.o"
+`,
+	},
+		Python,
+
+		muslHeaders,
+		KernelHeaders,
+	), version
+}
+func init() {
+	artifactsM[earlyCompilerRT] = Metadata{
+		f: Toolchain.newEarlyCompilerRT,
+
+		Name:        "early-compiler-rt",
+		Description: "early LLVM runtime: compiler-rt",
+
+		Dependencies: P{
+			Musl,
+		},
+	}
+}
+
+func (t Toolchain) newEarlyRuntimes() (pkg.Artifact, string) {
+	version := t.Version(llvmSource)
+	return t.NewPackage("early-runtimes", version, t.Load(llvmSource), &PackageAttr{
+		Flag: TExclusive,
+	}, &CMakeHelper{
+		Append: []string{"runtimes"},
+
+		Cache: []KV{
+			// libc++ not yet available
+			{"CMAKE_CXX_COMPILER_WORKS", "ON"},
+
+			{"LLVM_HOST_TRIPLE", `"${ROSA_TRIPLE}"`},
+			{"LLVM_DEFAULT_TARGET_TRIPLE", `"${ROSA_TRIPLE}"`},
+			{"LLVM_ENABLE_RUNTIMES", "'libunwind;libcxx;libcxxabi'"},
+
+			{"LIBUNWIND_USE_COMPILER_RT", "ON"},
+			{"LIBCXX_HAS_MUSL_LIBC", "ON"},
+			{"LIBCXX_USE_COMPILER_RT", "ON"},
+			{"LIBCXX_HAS_ATOMIC_LIB", "OFF"},
+			{"LIBCXXABI_USE_COMPILER_RT", "ON"},
+			{"LIBCXXABI_USE_LLVM_UNWINDER", "ON"},
+			{"LIBCXXABI_HAS_CXA_THREAD_ATEXIT_IMPL", "OFF"},
+
+			{"LLVM_ENABLE_ZLIB", "FORCE_ON"},
+			{"LLVM_ENABLE_ZSTD", "FORCE_ON"},
+			{"LLVM_ENABLE_LIBXML2", "OFF"},
+		},
+		SkipTest: true,
+	},
+		Python,
+
+		Zlib,
+		Zstd,
+		earlyCompilerRT,
+		KernelHeaders,
+	), version
+}
+func init() {
+	artifactsM[earlyRuntimes] = Metadata{
+		f: Toolchain.newEarlyRuntimes,
+
+		Name:        "early-runtimes",
+		Description: "early LLVM runtimes: libunwind, libcxx, libcxxabi",
+
+		Dependencies: P{
+			earlyCompilerRT,
+		},
+	}
+}
+
 func (t Toolchain) newLLVM() (pkg.Artifact, string) {
-	const (
-		version  = "22.1.4"
-		checksum = "Bk3t-tV5sD5T0bqefFMcLeFuAwXnhFipywZmqst5hAZs97QQWGKB_5XyAFjj5tDB"
-	)
+	var early PArtifact = muslHeaders
+	if t.isStage0() {
+		// The LLVM build system is buggy around LLVM_LINK_LLVM_DYLIB and leaks
+		// the system installation when invoking the newly built toolchain. This
+		// is worked around in stage0 by providing standalone builds of
+		// runtimes. Later stages rely on 3-stage determinism and allows the
+		// system installation from its previous stage to leak through.
+		early = earlyRuntimes
+	}
 
 	cache := []KV{
-		{"CMAKE_BUILD_TYPE", "Release"},
-
 		{"ENABLE_LINKER_BUILD_ID", "ON"},
 		{"COMPILER_RT_USE_BUILTINS_LIBRARY", "ON"},
 		{"COMPILER_RT_DEFAULT_TARGET_ONLY", "ON"},
@@ -93,10 +230,14 @@ func (t Toolchain) newLLVM() (pkg.Artifact, string) {
 			// unwind: fails on musl
 			"eh_frame_fde_pc_range",
 		}
-		for i, s := range skipChecks {
-			s = regexp.QuoteMeta(s)
-			s = strings.ReplaceAll(s, "/", "\\/")
-			skipChecks[i] = s
+		switch runtime.GOARCH {
+		case "arm64":
+			skipChecks = append(skipChecks,
+				// LLVM: intermittently crashes
+				"ExecutionEngine/OrcLazy/multiple-compile-threads-basic.ll",
+				// unwind: unexpectedly passes
+				"unwind_leaffunction",
+			)
 		}
 
 		if presetOpts&OptLLVMNoLTO == 0 {
@@ -110,25 +251,20 @@ func (t Toolchain) newLLVM() (pkg.Artifact, string) {
 			// symbols: clock_gettime, mallopt
 			{"COMPILER_RT_INCLUDE_TESTS", "OFF"},
 
-			{"LLVM_LIT_ARGS", "'" + strings.Join([]string{
-				"--verbose",
-				"--filter-out='\\''" + strings.Join(skipChecks, "|") + "'\\''",
-			}, " ") + "'"},
+			{"LLVM_BUILD_TESTS", "ON"},
+			{"LLVM_LIT_ARGS", litArgs(true, skipChecks...)},
 		}...)
 	}
 
-	return t.NewPackage("llvm", version, t.NewPatchedSource("llvm", version, newFromGitHub(
-		"llvm/llvm-project",
-		"llvmorg-"+version,
-		checksum,
-	), true, llvmPatches...), nil, &CMakeHelper{
+	version := t.Version(llvmSource)
+	return t.NewPackage("llvm", version, t.Load(llvmSource), nil, &CMakeHelper{
 		Append: []string{"llvm"},
 
 		Cache: cache,
 		Script: `
 ln -s ld.lld /work/system/bin/ld
-
 ln -s clang /work/system/bin/cc
+ln -s clang /work/system/bin/cpp
 ln -s clang++ /work/system/bin/c++
 `,
 
@@ -159,11 +295,31 @@ ninja ` + jobsFlagE + ` check-all
 
 		Zlib,
 		Zstd,
-		muslHeaders,
+		early,
 		KernelHeaders,
 	), version
 }
 func init() {
+	const (
+		version  = "22.1.4"
+		checksum = "Bk3t-tV5sD5T0bqefFMcLeFuAwXnhFipywZmqst5hAZs97QQWGKB_5XyAFjj5tDB"
+	)
+
+	artifactsM[llvmSource] = Metadata{
+		f: func(t Toolchain) (pkg.Artifact, string) {
+			return t.NewPatchedSource("llvm", version, newFromGitHub(
+				"llvm/llvm-project",
+				"llvmorg-"+version,
+				checksum,
+			), true, llvmPatches...), version
+		},
+
+		Name:        "llvm-project",
+		Description: "LLVM monorepo with Rosa OS patches",
+
+		ID: 1830,
+	}
+
 	artifactsM[LLVM] = Metadata{
 		f: Toolchain.newLLVM,
 
@@ -176,7 +332,5 @@ func init() {
 			Zstd,
 			Musl,
 		},
-
-		ID: 1830,
 	}
 }

internal/rosa/python.go

@@ -351,6 +351,29 @@ func init() {
 	)
 }
 
+func init() {
+	artifactsM[LIT] = Metadata{
+		f: func(t Toolchain) (pkg.Artifact, string) {
+			version := t.Version(LLVM)
+			return t.NewPackage("lit", version, t.Load(llvmSource), nil, &PipHelper{
+				Append: []string{"llvm", "utils", "lit"},
+				// already checked during llvm
+				SkipCheck: true,
+			},
+				PythonSetuptools,
+			), version
+		},
+
+		Name:        "lit",
+		Description: "a portable tool for executing LLVM and Clang style test suites",
+		Website:     "https://llvm.org/docs/CommandGuide/lit.html",
+
+		Dependencies: P{
+			Python,
+		},
+	}
+}
+
 func init() {
 	const (
 		version  = "1.1.1"

internal/rosa/stage0.go

@@ -47,6 +47,7 @@ func NewStage0() pkg.Artifact {
 				"stage0-"+triplet()+".tar.bz2",
 			perArch[string]{
 				"amd64": "ldz-WkSx2wxUK4ndi-tlaaU8ykOowbpGRcBsciAcIDdnX6-QfzQg_se3lsZYuzuK",
+				"arm64": "_mo39S_sgzPYaIQ_Wi13O46KPQuWqCCiZdildpz6a8MTh2khIt68tNIulyUGBV2z",
 			}.unwrap(),
 			pkg.TarBzip2,
 		)

internal/rosa/x.go

@@ -26,19 +26,50 @@ func init() {
 	}
 }
 
-func (t Toolchain) newXproto() (pkg.Artifact, string) {
+func (t Toolchain) newLibxtrans() (pkg.Artifact, string) {
 	const (
-		version  = "7.0.31"
-		checksum = "Cm69urWY5RctKpR78eGzuwrjDEfXGkvHRdodj6sjypOGy5FF4-lmnUttVHYV1ydg"
+		version  = "1.6.0"
+		checksum = "1cxDCF59fLf1HyGDMcjR1L50ZbjD0RTTEDUpOJYcHXu6HUK_Ds0x-KREY7rLNxu9"
 	)
-	return t.NewPackage("xproto", version, newTar(
-		"https://www.x.org/releases/individual/proto/"+
-			"xproto-"+version+".tar.bz2",
+	return t.NewPackage("libxtrans", version, newFromGitLab(
+		"gitlab.freedesktop.org",
+		"xorg/lib/libxtrans",
+		"xtrans-"+version,
 		checksum,
-		pkg.TarBzip2,
 	), nil, &MakeHelper{
-		// ancient configure script
-		Generate: "autoreconf -if",
+		Generate: "NOCONFIGURE=1 ./autogen.sh",
+	},
+		Automake,
+		Libtool,
+		PkgConfig,
+
+		utilMacros,
+	), version
+}
+func init() {
+	artifactsM[Libxtrans] = Metadata{
+		f: Toolchain.newLibxtrans,
+
+		Name:        "libxtrans",
+		Description: "X Window System Protocols Transport layer shared code",
+		Website:     "https://gitlab.freedesktop.org/xorg/lib/libxtrans",
+
+		ID: 13441,
+	}
+}
+
+func (t Toolchain) newXorgProto() (pkg.Artifact, string) {
+	const (
+		version  = "2025.1"
+		checksum = "pTwJiBJHKA6Rgm3cVDXy1lyvXNIUzTRaukvvYdk1xWoJ_1G-Dfjm9MyewuyIjoHz"
+	)
+	return t.NewPackage("xorgproto", version, newFromGitLab(
+		"gitlab.freedesktop.org",
+		"xorg/proto/xorgproto",
+		"xorgproto-"+version,
+		checksum,
+	), nil, &MakeHelper{
+		Generate: "NOCONFIGURE=1 ./autogen.sh",
 	},
 		Automake,
 		PkgConfig,
@@ -47,14 +78,14 @@ func (t Toolchain) newXproto() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[Xproto] = Metadata{
-		f: Toolchain.newXproto,
+	artifactsM[XorgProto] = Metadata{
+		f: Toolchain.newXorgProto,
 
-		Name:        "xproto",
+		Name:        "xorgproto",
 		Description: "X Window System unified protocol definitions",
 		Website:     "https://gitlab.freedesktop.org/xorg/proto/xorgproto",
 
-		ID: 13650,
+		ID: 17190,
 	}
 }
 
@@ -77,7 +108,7 @@ func (t Toolchain) newLibXau() (pkg.Artifact, string) {
 		PkgConfig,
 
 		utilMacros,
-		Xproto,
+		XorgProto,
 	), version
 }
 func init() {
@@ -89,13 +120,186 @@ func init() {
 		Website:     "https://gitlab.freedesktop.org/xorg/lib/libxau",
 
 		Dependencies: P{
-			Xproto,
+			XorgProto,
 		},
 
 		ID: 1765,
 	}
 }
 
+func (t Toolchain) newXCBProto() (pkg.Artifact, string) {
+	const (
+		version  = "1.17.0"
+		checksum = "_NtbKaJ_iyT7XiJz25mXQ7y-niTzE8sHPvLXZPcqtNoV_-vTzqkezJ8Hp2U1enCv"
+	)
+	return t.NewPackage("xcb-proto", version, newTar(
+		"https://xcb.freedesktop.org/dist/xcb-proto-"+version+".tar.gz",
+		checksum,
+		pkg.TarGzip,
+	), nil, (*MakeHelper)(nil),
+		Python,
+	), version
+}
+func init() {
+	artifactsM[XCBProto] = Metadata{
+		f: Toolchain.newXCBProto,
+
+		Name:        "xcb-proto",
+		Description: "XML-XCB protocol descriptions used by libxcb for the X11 protocol & extensions",
+		Website:     "https://gitlab.freedesktop.org/xorg/proto/xcbproto",
+
+		ID: 13646,
+	}
+}
+
+func (t Toolchain) newXCB() (pkg.Artifact, string) {
+	const (
+		version  = "1.17.0"
+		checksum = "hjjsc79LpWM_hZjNWbDDS6qRQUXREjjekS6UbUsDq-RR1_AjgNDxhRvZf-1_kzDd"
+	)
+	return t.NewPackage("xcb", version, newTar(
+		"https://xcb.freedesktop.org/dist/libxcb-"+version+".tar.gz",
+		checksum,
+		pkg.TarGzip,
+	), nil, (*MakeHelper)(nil),
+		Python,
+		PkgConfig,
+
+		XCBProto,
+		LibXau,
+	), version
+}
+func init() {
+	artifactsM[XCB] = Metadata{
+		f: Toolchain.newXCB,
+
+		Name:        "xcb",
+		Description: "The X protocol C-language Binding",
+		Website:     "https://xcb.freedesktop.org/",
+
+		Dependencies: P{
+			XCBProto,
+			LibXau,
+		},
+
+		ID: 1767,
+	}
+}
+
+func (t Toolchain) newLibX11() (pkg.Artifact, string) {
+	const (
+		version  = "1.8.13"
+		checksum = "ARh-cuZY_U2v3DbPS1byc7ybh9NInZc-yav7SJiusk_C7408s058qWV83ocMd2pT"
+	)
+	return t.NewPackage("libX11", version, newFromGitLab(
+		"gitlab.freedesktop.org",
+		"xorg/lib/libx11",
+		"libX11-"+version,
+		checksum,
+	), nil, &MakeHelper{
+		Generate: "NOCONFIGURE=1 ./autogen.sh",
+
+		Configure: []KV{
+			{"enable-static"},
+			{"without-xmlto"},
+		},
+	},
+		Automake,
+		Libtool,
+		PkgConfig,
+
+		utilMacros,
+		Libxtrans,
+		XorgProto,
+		XCB,
+	), version
+}
+func init() {
+	artifactsM[LibX11] = Metadata{
+		f: Toolchain.newLibX11,
+
+		Name:        "libX11",
+		Description: `Core X11 protocol client library (aka "Xlib")`,
+		Website:     "https://gitlab.freedesktop.org/xorg/lib/libx11",
+
+		Dependencies: P{
+			XCB,
+		},
+
+		ID: 1764,
+	}
+}
+
+func (t Toolchain) newLibXext() (pkg.Artifact, string) {
+	const (
+		version  = "1.3.7"
+		checksum = "-0wvUDaucLPLNOrK1pcKhHNoO-5nUqQyyw6JAbhx65gRjuMiNKKaF2_tcrbC_KNq"
+	)
+	return t.NewPackage("libXext", version, newFromGitLab(
+		"gitlab.freedesktop.org",
+		"xorg/lib/libxext",
+		"libXext-"+version,
+		checksum,
+	), nil, &MakeHelper{
+		Generate: "NOCONFIGURE=1 ./autogen.sh",
+	},
+		Automake,
+		Libtool,
+		PkgConfig,
+
+		utilMacros,
+		LibX11,
+	), version
+}
+func init() {
+	artifactsM[LibXext] = Metadata{
+		f: Toolchain.newLibXext,
+
+		Name:        "libXext",
+		Description: "Xlib-based library for common extensions to the X11 protocol",
+		Website:     "https://gitlab.freedesktop.org/xorg/lib/libxext",
+
+		Dependencies: P{
+			LibX11,
+		},
+
+		ID: 1774,
+	}
+}
+
+func (t Toolchain) newLibxshmfence() (pkg.Artifact, string) {
+	const (
+		version  = "1.3.3"
+		checksum = "JamExTPg81By2fs3vWdeo_dzlpBQeAwXr2sDXeHJqm9XBoLW5pamiD6FgAWtAKyA"
+	)
+	return t.NewPackage("libxshmfence", version, newFromGitLab(
+		"gitlab.freedesktop.org",
+		"xorg/lib/libxshmfence",
+		"libxshmfence-"+version,
+		checksum,
+	), nil, &MakeHelper{
+		Generate: "NOCONFIGURE=1 ./autogen.sh",
+	},
+		Automake,
+		Libtool,
+		PkgConfig,
+
+		utilMacros,
+		XorgProto,
+	), version
+}
+func init() {
+	artifactsM[Libxshmfence] = Metadata{
+		f: Toolchain.newLibxshmfence,
+
+		Name:        "libxshmfence",
+		Description: "shared memory 'SyncFence' synchronization primitive",
+		Website:     "https://gitlab.freedesktop.org/xorg/lib/libxshmfence",
+
+		ID: 1792,
+	}
+}
+
 func (t Toolchain) newLibpciaccess() (pkg.Artifact, string) {
 	const (
 		version  = "0.19"

internal/rosa/xcb.go

@@ -1,62 +0,0 @@
-package rosa
-
-import "hakurei.app/internal/pkg"
-
-func (t Toolchain) newXCBProto() (pkg.Artifact, string) {
-	const (
-		version  = "1.17.0"
-		checksum = "_NtbKaJ_iyT7XiJz25mXQ7y-niTzE8sHPvLXZPcqtNoV_-vTzqkezJ8Hp2U1enCv"
-	)
-	return t.NewPackage("xcb-proto", version, newTar(
-		"https://xcb.freedesktop.org/dist/xcb-proto-"+version+".tar.gz",
-		checksum,
-		pkg.TarGzip,
-	), nil, (*MakeHelper)(nil),
-		Python,
-	), version
-}
-func init() {
-	artifactsM[XCBProto] = Metadata{
-		f: Toolchain.newXCBProto,
-
-		Name:        "xcb-proto",
-		Description: "XML-XCB protocol descriptions used by libxcb for the X11 protocol & extensions",
-		Website:     "https://gitlab.freedesktop.org/xorg/proto/xcbproto",
-
-		ID: 13646,
-	}
-}
-
-func (t Toolchain) newXCB() (pkg.Artifact, string) {
-	const (
-		version  = "1.17.0"
-		checksum = "hjjsc79LpWM_hZjNWbDDS6qRQUXREjjekS6UbUsDq-RR1_AjgNDxhRvZf-1_kzDd"
-	)
-	return t.NewPackage("xcb", version, newTar(
-		"https://xcb.freedesktop.org/dist/libxcb-"+version+".tar.gz",
-		checksum,
-		pkg.TarGzip,
-	), nil, (*MakeHelper)(nil),
-		Python,
-		PkgConfig,
-
-		XCBProto,
-		LibXau,
-	), version
-}
-func init() {
-	artifactsM[XCB] = Metadata{
-		f: Toolchain.newXCB,
-
-		Name:        "xcb",
-		Description: "The X protocol C-language Binding",
-		Website:     "https://xcb.freedesktop.org/",
-
-		Dependencies: P{
-			XCBProto,
-			LibXau,
-		},
-
-		ID: 1767,
-	}
-}

internal/rosa/zlib.go

@@ -13,8 +13,6 @@ func (t Toolchain) newZlib() (pkg.Artifact, string) {
 		pkg.TarGzip,
 	), nil, &CMakeHelper{
 		Cache: []KV{
-			{"CMAKE_BUILD_TYPE", "Release"},
-
 			{"CMAKE_C_FLAGS", "-fPIC"},
 			{"ZLIB_BUILD_TESTING", "ON"},
 			{"ZLIB_BUILD_SHARED", "ON"},

internal/rosa/zstd.go

@@ -19,9 +19,6 @@ func (t Toolchain) newZstd() (pkg.Artifact, string) {
 		Chmod:    true,
 	}, &CMakeHelper{
 		Append: []string{"build", "cmake"},
-		Cache: []KV{
-			{"CMAKE_BUILD_TYPE", "Release"},
-		},
 		Test: `
 make -C /usr/src/zstd/tests datagen
 ZSTD_BIN=/cure/programs/zstd /usr/src/zstd/tests/playTests.sh