commit: a1d404ce4f053a67bae6948db29375974a03542b Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Nov 28 04:33:27 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Nov 28 06:52:15 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1d404ce
dev-build/guildmaster: further meson tweak Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/0001-meson-add-build-system.patch | 2 +- .../0002-Add-OpenRC-systemd-service-files.patch | 28 +++++++++++----------- .../guildmaster/guildmaster-0_pre20251122.ebuild | 6 ++--- dev-build/guildmaster/guildmaster-9999.ebuild | 6 ++--- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dev-build/guildmaster/files/0001-meson-add-build-system.patch b/dev-build/guildmaster/files/0001-meson-add-build-system.patch index c2d9479ce42c..de6862ef6adc 100644 --- a/dev-build/guildmaster/files/0001-meson-add-build-system.patch +++ b/dev-build/guildmaster/files/0001-meson-add-build-system.patch @@ -1,7 +1,7 @@ https://codeberg.org/amonakov/guildmaster/pulls/1 From 418bfa323cf91c63fbc468568c274388fdf0c383 Mon Sep 17 00:00:00 2001 -Message-ID: <418bfa323cf91c63fbc468568c274388fdf0c383.1764302913.git....@gentoo.org> +Message-ID: <418bfa323cf91c63fbc468568c274388fdf0c383.1764304322.git....@gentoo.org> From: Sam James <[email protected]> Date: Thu, 27 Nov 2025 23:50:10 +0000 Subject: [PATCH 1/2] meson: add build system diff --git a/dev-build/guildmaster/files/0002-Add-OpenRC-systemd-service-files.patch b/dev-build/guildmaster/files/0002-Add-OpenRC-systemd-service-files.patch index ed927e9a78a7..84e69fae679a 100644 --- a/dev-build/guildmaster/files/0002-Add-OpenRC-systemd-service-files.patch +++ b/dev-build/guildmaster/files/0002-Add-OpenRC-systemd-service-files.patch @@ -1,9 +1,9 @@ https://codeberg.org/amonakov/guildmaster/pulls/1 -From f9d11460f1172981ed2356bf57f9c0bcf407ad8a Mon Sep 17 00:00:00 2001 -Message-ID: <f9d11460f1172981ed2356bf57f9c0bcf407ad8a.1764302913.git....@gentoo.org> -In-Reply-To: <418bfa323cf91c63fbc468568c274388fdf0c383.1764302913.git....@gentoo.org> -References: <418bfa323cf91c63fbc468568c274388fdf0c383.1764302913.git....@gentoo.org> +From 22a4fc1504f547b1f685e43bf36b85abdb3b2b8d Mon Sep 17 00:00:00 2001 +Message-ID: <22a4fc1504f547b1f685e43bf36b85abdb3b2b8d.1764304322.git....@gentoo.org> +In-Reply-To: <418bfa323cf91c63fbc468568c274388fdf0c383.1764304322.git....@gentoo.org> +References: <418bfa323cf91c63fbc468568c274388fdf0c383.1764304322.git....@gentoo.org> From: Sam James <[email protected]> Date: Fri, 28 Nov 2025 02:05:02 +0000 Subject: [PATCH 2/2] Add OpenRC, systemd service files @@ -52,7 +52,7 @@ index 0000000..d76a6bb +WantedBy=multi-user.target + diff --git a/meson.build b/meson.build -index 83d2123..e336485 100644 +index 83d2123..c1ade60 100644 --- a/meson.build +++ b/meson.build @@ -8,7 +8,14 @@ project( @@ -61,11 +61,11 @@ index 83d2123..e336485 100644 fuse_dep = dependency('fuse3') -udev_dep = dependency('udev', required: false) + -+if get_option('udev').enabled() ++if get_option('udev') + udev_dep = dependency('udev', required: false) +endif + -+if get_option('systemd').enabled() ++if get_option('systemd') + systemd_dep = dependency('systemd', required: false) +endif @@ -79,7 +79,7 @@ index 83d2123..e336485 100644 - ['cuse-guild.rules'], - install_dir: join_paths(udev_dep.get_variable('udevdir'), 'rules.d'), -) -+if get_option('udev').enabled() ++if get_option('udev') + if udev_dep.found() + udevrulesdir = join_paths(udev_dep.get_variable('udevdir'), 'rules.d') + else @@ -95,7 +95,7 @@ index 83d2123..e336485 100644 + ) +endif + -+if get_option('openrc').enabled() ++if get_option('openrc') + install_data( + ['guildmaster.confd'], + rename: ['guildmaster'], @@ -108,7 +108,7 @@ index 83d2123..e336485 100644 + ) +endif + -+if get_option('systemd').enabled() ++if get_option('systemd') + if systemd_dep.found() + systemdunitdir = systemd_dep.get_variable('systemdsystemunitdir') + else @@ -125,14 +125,14 @@ index 83d2123..e336485 100644 +endif diff --git a/meson.options b/meson.options new file mode 100644 -index 0000000..bc21302 +index 0000000..4b5dd5d --- /dev/null +++ b/meson.options @@ -0,0 +1,5 @@ -+option('openrc', type : 'feature', value : 'auto', description : 'Install OpenRC service files') -+option('systemd', type : 'feature', value : 'auto', description : 'Install systemd service files') ++option('openrc', type : 'boolean', value : true, description : 'Install OpenRC service files') ++option('systemd', type : 'boolean', value : true, description : 'Install systemd service files') +option('systemdunitdir', type: 'string', description: 'systemd services directory (defaults to /usr/lib/systemd/system') -+option('udev', type : 'feature', value : 'auto', description : 'Install udev rules') ++option('udev', type : 'boolean', value : true, description : 'Install udev rules') +option('udevrulesdir', type : 'string', description : 'udev rules directory (defaults to /usr/lib/udev/rules.d)') -- 2.52.0 diff --git a/dev-build/guildmaster/guildmaster-0_pre20251122.ebuild b/dev-build/guildmaster/guildmaster-0_pre20251122.ebuild index 166fa078435c..4eb4cf3fcb4d 100644 --- a/dev-build/guildmaster/guildmaster-0_pre20251122.ebuild +++ b/dev-build/guildmaster/guildmaster-0_pre20251122.ebuild @@ -35,10 +35,10 @@ PATCHES=( src_configure() { local emesonargs=( - -Dopenrc=enabled - -Dsystemd=enabled + -Dopenrc=true + -Dsystemd=true -Dsystemdunitdir="$(systemd_get_systemunitdir)" - -Dudev=enabled + -Dudev=true -Dudevrulesdir="$(get_udevdir)"/rules.d ) diff --git a/dev-build/guildmaster/guildmaster-9999.ebuild b/dev-build/guildmaster/guildmaster-9999.ebuild index 166fa078435c..4eb4cf3fcb4d 100644 --- a/dev-build/guildmaster/guildmaster-9999.ebuild +++ b/dev-build/guildmaster/guildmaster-9999.ebuild @@ -35,10 +35,10 @@ PATCHES=( src_configure() { local emesonargs=( - -Dopenrc=enabled - -Dsystemd=enabled + -Dopenrc=true + -Dsystemd=true -Dsystemdunitdir="$(systemd_get_systemunitdir)" - -Dudev=enabled + -Dudev=true -Dudevrulesdir="$(get_udevdir)"/rules.d )
