diff options
Diffstat (limited to 'app-emulation/qemu/qemu-9999.ebuild')
| -rw-r--r-- | app-emulation/qemu/qemu-9999.ebuild | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 5564dc4c8420..df162166cbf8 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -16,7 +16,9 @@ inherit eutils linux-info toolchain-funcs multilib python-r1 \ if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://git.qemu.org/git/qemu.git" EGIT_SUBMODULES=( - tests/fp/berkeley-{test,soft}float-3 + meson + tests/fp/berkeley-softfloat-3 + tests/fp/berkeley-testfloat-3 ui/keycodemapdb ) inherit git-r3 @@ -223,9 +225,8 @@ RDEPEND="${CDEPEND} PATCHES=( "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch - "${FILESDIR}"/${PN}-4.0.0-mkdir_systemtap.patch #684902 - "${FILESDIR}"/${PN}-4.2.0-cflags.patch - "${FILESDIR}"/${PN}-5.1.0-pixman-for-vhost-user-gpu.patch + "${FILESDIR}"/${PN}-9999-cflags.patch + "${FILESDIR}"/${PN}-9999-format-error.patch ) QA_PREBUILT=" @@ -412,7 +413,6 @@ qemu_src_configure() { --datadir=/usr/share --docdir=/usr/share/doc/${PF}/html --mandir=/usr/share/man - --with-confsuffix=/qemu --localstatedir=/var --disable-bsd-user --disable-containers # bug #732972 @@ -445,6 +445,14 @@ qemu_src_configure() { use_enable "$@" fi } + # Ennable option only for softmmu build, but not 'user' or 'tools' + conf_softmmu() { + if [[ ${buildtype} == "softmmu" ]] ; then + use_enable "$@" + else + echo "--disable-${2:-$1}" + fi + } conf_opts+=( $(conf_notuser accessibility brlapi) $(conf_notuser aio linux-aio) @@ -473,7 +481,7 @@ qemu_src_configure() { $(conf_notuser rbd) $(conf_notuser sasl vnc-sasl) $(conf_notuser sdl) - $(conf_notuser sdl-image) + $(conf_softmmu sdl-image) $(conf_notuser seccomp) $(conf_notuser slirp slirp system) $(conf_notuser smartcard) |