Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/files/, app-emulation/qemu/
Date: Sat, 26 Jun 2021 19:59:15
Message-Id: 1624737545.f09915592646599a26c0be1f368809f4a5e84532.slyfox@gentoo
1 commit: f09915592646599a26c0be1f368809f4a5e84532
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 26 19:55:04 2021 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 26 19:59:05 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0991559
7
8 app-emulation/qemu: allow MAKE='make ...' form
9
10 Reported-by: Toralf Förster
11 Closes: https://bugs.gentoo.org/795678
12 Package-Manager: Portage-3.0.20, Repoman-3.0.3
13 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
14
15 app-emulation/qemu/files/qemu-6.0.0-make.patch | 14 ++++++++++++++
16 app-emulation/qemu/qemu-6.0.0.ebuild | 1 +
17 2 files changed, 15 insertions(+)
18
19 diff --git a/app-emulation/qemu/files/qemu-6.0.0-make.patch b/app-emulation/qemu/files/qemu-6.0.0-make.patch
20 new file mode 100644
21 index 00000000000..2dac1ca11d9
22 --- /dev/null
23 +++ b/app-emulation/qemu/files/qemu-6.0.0-make.patch
24 @@ -0,0 +1,14 @@
25 +Allow MAKE='make V=1' and similar.
26 +
27 +https://bugs.gentoo.org/795678
28 +--- a/configure
29 ++++ b/configure
30 +@@ -1953,7 +1953,7 @@ if test -z "$python"
31 + then
32 + error_exit "Python not found. Use --python=/path/to/python"
33 + fi
34 +-if ! has "$make"
35 ++if ! has $make
36 + then
37 + error_exit "GNU make ($make) not found"
38 + fi
39
40 diff --git a/app-emulation/qemu/qemu-6.0.0.ebuild b/app-emulation/qemu/qemu-6.0.0.ebuild
41 index fbd240df60c..8a8069a10e2 100644
42 --- a/app-emulation/qemu/qemu-6.0.0.ebuild
43 +++ b/app-emulation/qemu/qemu-6.0.0.ebuild
44 @@ -276,6 +276,7 @@ PATCHES=(
45 "${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch
46 "${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
47 "${FILESDIR}"/${PN}-5.2.0-dce-locks.patch
48 + "${FILESDIR}"/${PN}-6.0.0-make.patch
49 )
50
51 QA_PREBUILT="