rosa/hakurei
6
4
Fork 2
Code Issues 11 Pull Requests 1 Actions Packages Projects Releases 21 Wiki Activity

internal/rosa/meson: always prepend D
Test / Create distribution (push) Successful in 58s
Details
Test / Sandbox (push) Successful in 3m1s
Details
Test / ShareFS (push) Successful in 4m37s
Details
Test / Hakurei (push) Successful in 4m43s
Details
Test / Sandbox (race detector) (push) Successful in 6m5s
Details
Test / Hakurei (race detector) (push) Successful in 7m13s
Details
Test / Flake checks (push) Successful in 1m6s
Details

Browse Source 
All flags in practice use this convention. An escape hatch is available by leaving the value empty.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
Ophestra
2026-07-14 22:13:04 +09:00
parent 098943ab46
commit 4cf235675a
24 changed files with 87 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/rosa/meson.go
+7 -10
View File
@@ -56,8 +56,8 @@ func (*MesonHelper) wantsDir() (string, bool) { return `"$(mktemp -d)"`, false }
// isPython returns whether the legacy python implementation is used. // isPython returns whether the legacy python implementation is used.
func (attr *MesonHelper) isPython() bool { func (attr *MesonHelper) isPython() bool {
return attr != nil && return attr == nil ||
(!attr.Muon || len(attr.SkipTests) != 0 || attr.InteractiveTest) !attr.Muon || len(attr.SkipTests) != 0 || attr.InteractiveTest
} }
// script generates the cure script. // script generates the cure script.
@@ -106,16 +106,13 @@ func (attr *MesonHelper) script(t Toolchain, name string) string {
` + muon + ` setup \ ` + muon + ` setup \
` + strings.Join(slices.Collect(func(yield func(string) bool) { ` + strings.Join(slices.Collect(func(yield func(string) bool) {
for _, v := range append([]KV{ for _, v := range append([]KV{
{"Dwrap_mode", "nofallback"}, {"wrap_mode", "nofallback"},
{"Dprefix", "/system"}, {"prefix", "/system"},
{"Dbuildtype", "release"}, {"buildtype", "release"},
}, attr.Setup...) { }, attr.Setup...) {
s := "-" + v[0] s := v[0]
if len(v[0]) > 0 && v[0][0] != 'D' {
s = "-" + s
}
if v[1] != "" { if v[1] != "" {
s += "=" + v[1] s = "-D" + s + "=" + v[1]
} }
if !yield(s) { if !yield(s) {
return return
internal/rosa/package/cairo.az
+9 -9
View File
@@ -13,16 +13,16 @@ package cairo {
exec = meson { exec = meson {
setup = { setup = {
"Ddwrite": "enabled"; "dwrite": "enabled";
"Dfontconfig": "enabled"; "fontconfig": "enabled";
"Dfreetype": "enabled"; "freetype": "enabled";
"Dpng": "enabled"; "png": "enabled";
"Dtee": "enabled"; "tee": "enabled";
"Dxcb": "enabled"; "xcb": "enabled";
"Dxlib": "disabled"; "xlib": "disabled";
"Dxlib-xcb": "disabled"; "xlib-xcb": "disabled";
"Dzlib": "enabled"; "zlib": "enabled";
}; };
// runs the entire test suite in a single meson test // runs the entire test suite in a single meson test
interactiveTest = true; interactiveTest = true;
internal/rosa/package/dbus.az
+4 -4
View File
@@ -19,9 +19,9 @@ package dbus {
exec = meson { exec = meson {
setup = { setup = {
"Depoll": "enabled"; "epoll": "enabled";
"Dinotify": "enabled"; "inotify": "enabled";
"Dx11_autolaunch": "disabled"; "x11_autolaunch": "disabled";
}; };
}; };
@@ -50,7 +50,7 @@ package xdg-dbus-proxy {
exec = meson { exec = meson {
setup = { setup = {
"Dman": "disabled"; "man": "disabled";
}; };
}; };
internal/rosa/package/dtc.az
+1 -1
View File
@@ -18,7 +18,7 @@ package dtc {
exec = meson { exec = meson {
setup = { setup = {
"Dyaml": "disabled"; "yaml": "disabled";
}; };
}; };
internal/rosa/package/fribidi.az
+1 -1
View File
@@ -12,7 +12,7 @@ package fribidi {
exec = meson { exec = meson {
setup = { setup = {
"Ddocs": "false"; "docs": "false";
}; };
}; };
} }
internal/rosa/package/fuse.az
+4 -4
View File
@@ -14,10 +14,10 @@ package fuse {
exec = meson { exec = meson {
setup = { setup = {
"Ddefault_library": "both"; "default_library": "both";
"Dtests": "true"; "tests": "true";
"Duseroot": "false"; "useroot": "false";
"Dinitscriptdir": "/system/etc"; "initscriptdir": "/system/etc";
}; };
postCompile = "python3 -m pytest test/"; postCompile = "python3 -m pytest test/";
internal/rosa/package/glib/package.az
+1 -1
View File
@@ -17,7 +17,7 @@ package glib {
exec = meson { exec = meson {
setup = { setup = {
"Ddefault_library": "both"; "default_library": "both";
}; };
// fails with ipv6 disabled // fails with ipv6 disabled
skipTests = [ "gio" ]; skipTests = [ "gio" ];
internal/rosa/package/harfbuzz.az
+4 -4
View File
@@ -12,10 +12,10 @@ package harfbuzz {
exec = meson { exec = meson {
setup = { setup = {
"Dcairo": "enabled"; "cairo": "enabled";
"Dpng": "enabled"; "png": "enabled";
"Dzlib": "enabled"; "zlib": "enabled";
"Dfreetype": "enabled"; "freetype": "enabled";
}; };
}; };
internal/rosa/package/kmod.az
+6 -6
View File
@@ -13,12 +13,12 @@ package kmod {
exec = meson { exec = meson {
setup = { setup = {
"Dmoduledir": "/system/lib/modules"; "moduledir": "/system/lib/modules";
"Dsysconfdir": "/system/etc"; "sysconfdir": "/system/etc";
"Dbashcompletiondir": "no"; "bashcompletiondir": "no";
"Dfishcompletiondir": "no"; "fishcompletiondir": "no";
"Dxz": "disabled"; "xz": "disabled";
"Dmanpages": "false"; "manpages": "false";
}; };
// makes assumptions about the running kernel // makes assumptions about the running kernel
internal/rosa/package/libdrm.az
+1 -1
View File
@@ -13,7 +13,7 @@ package libdrm {
exec = meson { exec = meson {
setup = { setup = {
"Dintel": "enabled"; "intel": "enabled";
}; };
}; };
internal/rosa/package/libepoxy.az
+2 -2
View File
@@ -12,8 +12,8 @@ package libepoxy {
exec = meson { exec = meson {
setup = { setup = {
"Dglx": "yes"; "glx": "yes";
"Degl": "yes"; "egl": "yes";
}; };
}; };
internal/rosa/package/libevdev.az
+1 -1
View File
@@ -13,7 +13,7 @@ package libevdev {
exec = meson { exec = meson {
setup = { setup = {
"Ddocumentation": "disabled"; "documentation": "disabled";
}; };
}; };
internal/rosa/package/libglvnd.az
+2 -2
View File
@@ -13,8 +13,8 @@ package libglvnd {
exec = meson { exec = meson {
setup = { setup = {
"Dx11": "enabled"; "x11": "enabled";
"Dglx": "enabled"; "glx": "enabled";
}; };
postCompile = ` postCompile = `
internal/rosa/package/libinput.az
+3 -3
View File
@@ -14,9 +14,9 @@ package libinput {
bin = [ "bash" ]; bin = [ "bash" ];
exec = meson { exec = meson {
setup = { setup = {
"Dmtdev": "false"; "mtdev": "false";
"Dlibwacom": "false"; "libwacom": "false";
"Ddebug-gui": "false"; "debug-gui": "false";
}; };
}; };
internal/rosa/package/libva.az
+3 -3
View File
@@ -12,9 +12,9 @@ package libva {
exec = meson { exec = meson {
setup = { setup = {
"Dwith_x11": "yes"; "with_x11": "yes";
"Dwith_glx": "yes"; "with_glx": "yes";
"Dwith_wayland": "yes"; "with_wayland": "yes";
}; };
}; };
internal/rosa/package/mesa.az
+10 -10
View File
@@ -14,14 +14,14 @@ package mesa {
exec = meson { exec = meson {
setup = { setup = {
"Dplatforms": "x11,wayland"; "platforms": "x11,wayland";
"Dvideo-codecs": "all"; "video-codecs": "all";
"Dglvnd": "enabled"; "glvnd": "enabled";
"Dgbm": "enabled"; "gbm": "enabled";
"Degl": "enabled"; "egl": "enabled";
"Dgallium-drivers": join { "gallium-drivers": join {
elems = [ elems = [
"asahi", // Apple AGX "asahi", // Apple AGX
"crocus", // Intel legacy "crocus", // Intel legacy
@@ -51,7 +51,7 @@ package mesa {
sep = ","; sep = ",";
}; };
"Dvulkan-drivers": join { "vulkan-drivers": join {
elems = [ elems = [
"amd", // AMD (aka RADV) "amd", // AMD (aka RADV)
"broadcom", // Broadcom VC5 (Raspberry Pi 4, aka V3D) "broadcom", // Broadcom VC5 (Raspberry Pi 4, aka V3D)
@@ -72,7 +72,7 @@ package mesa {
sep = ","; sep = ",";
}; };
"Dvulkan-layers": join { "vulkan-layers": join {
elems = [ elems = [
"device-select", "device-select",
"intel-nullhw", "intel-nullhw",
@@ -84,8 +84,8 @@ package mesa {
sep = ","; sep = ",";
}; };
"Dfreedreno-kmds": "msm,virtio"; "freedreno-kmds": "msm,virtio";
"Damdgpu-virtio": "true"; "amdgpu-virtio": "true";
}; };
}; };
internal/rosa/package/p11-kit.az
+2 -2
View File
@@ -12,8 +12,8 @@ package p11-kit {
exec = meson { exec = meson {
setup = { setup = {
"Dsystemd": "disabled"; "systemd": "disabled";
"Dlibffi": "enabled"; "libffi": "enabled";
}; };
}; };
internal/rosa/package/pango.az
+3 -3
View File
@@ -13,9 +13,9 @@ package pango {
exec = meson { exec = meson {
setup = { setup = {
"Dfontconfig": "enabled"; "fontconfig": "enabled";
"Dfreetype": "enabled"; "freetype": "enabled";
"Dcairo": "enabled"; "cairo": "enabled";
}; };
// Fontconfig error: Cannot load default config file: File not found: /etc/fonts/fonts.conf // Fontconfig error: Cannot load default config file: File not found: /etc/fonts/fonts.conf
skipTest = true; skipTest = true;
internal/rosa/package/pixman.az
+1 -1
View File
@@ -13,7 +13,7 @@ package pixman {
exec = meson { exec = meson {
setup = { setup = {
"Dtests": "enabled"; "tests": "enabled";
}; };
}; };
} }
internal/rosa/package/seatd.az
+3 -3
View File
@@ -17,9 +17,9 @@ package seatd {
exec = meson { exec = meson {
setup = { setup = {
"Dlibseat-logind": "disabled"; "libseat-logind": "disabled";
"Dlibseat-seatd": "enabled"; "libseat-seatd": "enabled";
"Dlibseat-builtin": "enabled"; "libseat-builtin": "enabled";
}; };
}; };
internal/rosa/package/wayland.az
+3 -3
View File
@@ -19,9 +19,9 @@ echo 'int main(){}' > tests/sanity-test.c
exec = meson { exec = meson {
setup = { setup = {
"Ddefault_library": "both"; "default_library": "both";
"Ddocumentation": "false"; "documentation": "false";
"Dtests": "true"; "tests": "true";
}; };
}; };
internal/rosa/package/wlroots.az
+3 -3
View File
@@ -13,9 +13,9 @@ package wlroots {
exec = meson { exec = meson {
setup = { setup = {
"Dxwayland": "enabled"; "xwayland": "enabled";
"Dallocators": "gbm"; "allocators": "gbm";
"Dbackends": "drm,libinput"; "backends": "drm,libinput";
}; };
}; };
internal/rosa/package/x.az
+12 -12
View File
@@ -80,7 +80,7 @@ package libXau {
exec = meson { exec = meson {
setup = { setup = {
"Ddefault_library": "both"; "default_library": "both";
}; };
}; };
@@ -682,7 +682,7 @@ package libpciaccess {
exec = meson { exec = meson {
setup = { setup = {
"Dzlib": "enabled"; "zlib": "enabled";
}; };
}; };
@@ -705,17 +705,17 @@ package xserver {
exec = meson { exec = meson {
setup = { setup = {
"Dxorg": "true"; "xorg": "true";
"Dxephyr": "true"; "xephyr": "true";
"Dxnest": "true"; "xnest": "true";
"Dipv6": "false"; "ipv6": "false";
"Dudev": "false"; "udev": "false";
"Dudev_kms": "false"; "udev_kms": "false";
"Dglx": "false"; "glx": "false";
// ../../usr/src/xserver/glamor/glamor_glx.c:24:10: fatal error: 'epoxy/glx.h' file not found // ../../usr/src/xserver/glamor/glamor_glx.c:24:10: fatal error: 'epoxy/glx.h' file not found
"Dglamor": "false"; "glamor": "false";
}; };
}; };
@@ -784,8 +784,8 @@ package xwayland {
bin = [ "bash" ]; bin = [ "bash" ];
exec = meson { exec = meson {
setup = { setup = {
"Dipv6": "false"; "ipv6": "false";
"Dsystemd_notify": "false"; "systemd_notify": "false";
}; };
}; };
internal/rosa/package/xkbcommon.az
+1 -1
View File
@@ -16,7 +16,7 @@ package xkbcommon {
exec = meson { exec = meson {
setup = { setup = {
"Denable-x11": "false"; "enable-x11": "false";
}; };
}; };