diff options
| author |   Sam James <sam@gentoo.org> | 2022-09-06 20:12:10 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-09-06 20:12:59 +0100 |
| commit | 568d17e75c85695747fdbc0a84f93125fec7614c (patch) | |
| tree | 224e59f7fd7b118849bb64d33558e80dce747401 | |
| parent | dev-python/flask: Stabilize 2.2.1 ALLARCHES, #868885 (diff) | |
| download | gentoo-568d17e7.tar.gz gentoo-568d17e7.tar.bz2 gentoo-568d17e7.zip | |
sys-apps/fwupd: call vala_prepare in src_prepare to avoid binpkg use
It's ambiguous whether vala_prepare is supposed to do anything
for binpkg merges, but the convention has been to just
shove it in to src_prepare for now, so let's do that
to avoid trying to find Vala for binpkg installs.
Bug: https://bugs.gentoo.org/837857
Bug: https://bugs.gentoo.org/837965
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | sys-apps/fwupd/fwupd-1.7.7-r2.ebuild | 5 | ||||
| -rw-r--r-- | sys-apps/fwupd/fwupd-1.8.3.ebuild | 4 | ||||
| -rw-r--r-- | sys-apps/fwupd/fwupd-1.8.4.ebuild | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/sys-apps/fwupd/fwupd-1.7.7-r2.ebuild b/sys-apps/fwupd/fwupd-1.7.7-r2.ebuild index dc4a17a94fad..cc687abf943b 100644 --- a/sys-apps/fwupd/fwupd-1.7.7-r2.ebuild +++ b/sys-apps/fwupd/fwupd-1.7.7-r2.ebuild @@ -88,7 +88,7 @@ DEPEND=" pkg_setup() { python-single-r1_pkg_setup - vala_setup + if use nvme ; then kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4" fi @@ -96,6 +96,9 @@ pkg_setup() { src_prepare() { default + + vala_setup + # c.f. https://github.com/fwupd/fwupd/issues/1414 sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \ -i plugins/thunderbolt/meson.build || die diff --git a/sys-apps/fwupd/fwupd-1.8.3.ebuild b/sys-apps/fwupd/fwupd-1.8.3.ebuild index a07f8fae44aa..6dd2394f80cf 100644 --- a/sys-apps/fwupd/fwupd-1.8.3.ebuild +++ b/sys-apps/fwupd/fwupd-1.8.3.ebuild @@ -100,7 +100,7 @@ PATCHES=( pkg_setup() { python-single-r1_pkg_setup - vala_setup + if use nvme ; then kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4" fi @@ -109,6 +109,8 @@ pkg_setup() { src_prepare() { default + vala_setup + # c.f. https://github.com/fwupd/fwupd/issues/1414 sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \ -i plugins/thunderbolt/meson.build || die diff --git a/sys-apps/fwupd/fwupd-1.8.4.ebuild b/sys-apps/fwupd/fwupd-1.8.4.ebuild index 995724a81068..4d97b8c02eb5 100644 --- a/sys-apps/fwupd/fwupd-1.8.4.ebuild +++ b/sys-apps/fwupd/fwupd-1.8.4.ebuild @@ -99,7 +99,7 @@ PATCHES=( pkg_setup() { python-single-r1_pkg_setup - vala_setup + if use nvme ; then kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4" fi @@ -108,6 +108,8 @@ pkg_setup() { src_prepare() { default + vala_setup + # c.f. https://github.com/fwupd/fwupd/issues/1414 sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \ -i plugins/thunderbolt/meson.build || die |