From 9ee6d97c2883d42f204a533a8bc1f4562df778fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 16 Sep 2020 09:32:48 +0100 Subject: gentoo resync : 16.09.2020 --- app-emulation/qemu/Manifest | 6 ++++-- app-emulation/qemu/files/qemu-9999-cflags.patch | 12 ++++++++++++ .../qemu/files/qemu-9999-format-error.patch | 14 ++++++++++++++ app-emulation/qemu/qemu-5.1.0.ebuild | 2 +- app-emulation/qemu/qemu-9999.ebuild | 20 ++++++++++++++------ 5 files changed, 45 insertions(+), 9 deletions(-) create mode 100644 app-emulation/qemu/files/qemu-9999-cflags.patch create mode 100644 app-emulation/qemu/files/qemu-9999-format-error.patch (limited to 'app-emulation/qemu') diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest index 9af51a58051d..fd6abf9fd4e0 100644 --- a/app-emulation/qemu/Manifest +++ b/app-emulation/qemu/Manifest @@ -6,11 +6,13 @@ AUX qemu-4.2.0-cflags.patch 508 BLAKE2B 86724caca22a4bd2b21db306d04d8c0f6a542a15 AUX qemu-5.0.0-epoll-strace.patch 1455 BLAKE2B 8617fd020d36d0fc29d83d0340177f046ee58e08eb3663ae023647f0246450a8d65df1558731ecef06f29917411a26a97b2f9491e96efe4bf44e1a5be439999a SHA512 17f79dcc1e112d776875df281c13e12d58e43c0530718c992700d70030c9527f915193356db8e6f0fc721f8462f95305442c9393310f2a04df4d060f7e3a3f09 AUX qemu-5.0.0-ipv6-slirp-CVE-2020-10756.patch 1149 BLAKE2B 0ac27f524129e88061e59e123d2db9a985f14eb9f37941a9424e0bb70219f842ef372a332b20ce7674f2d7e1c4d2b8e0d8b970bf1d0affb5a3ecaf936d0e7677 SHA512 adfd1b8b8c321692a770fcc8a699b12558b1b68d29e7e7dc95f01d1006da963fca04df2303e1c374bdc597e07ac36471843d729b1005c0b487db4fb9ee05147c AUX qemu-5.1.0-pixman-for-vhost-user-gpu.patch 1788 BLAKE2B 9eddc15909cac5eb3357eb4e16921b8b51ba1107eaf272ce48e6f89705fa246ad3a8cd02abc534329671de3849f83a8515d22c39437961b5de25459f697d4600 SHA512 8df97af001e9d5c671da7ba1d651fae7ddca2f16337741ffa551227ae86bc627b6cbf37332beb0a6c9ee2444b7f40474804c4a7b79140d3e2b1dfe310a0b2502 +AUX qemu-9999-cflags.patch 228 BLAKE2B e7e7235cf2bccddf80c62f7154ab672fa0056e5bc3e4c12f036edcb87473f49185a6986ccc0e3485ff0faa76705beaa41461658975c5a2491fa6ae14014ec7c9 SHA512 213902b383d5801731d78acb9ab680f167216ebf3a0d11b430200c872efcd7acab9441cb48ae92f47c659eac994ca410741f224a4f1a1dd3648e10f1420c8d53 +AUX qemu-9999-format-error.patch 504 BLAKE2B 76e93c89ae29a385bafb5d7503746d57c30d7cd96166d5131ebb0662826f1131a905fee427f1410d376e28b7c6d9ea565d3b03c9ea3ba5e77cb663f638f11f78 SHA512 e65a1056cfc50266da2ca8703dde5f1ffd8fcbebe59c844bb3a9046a8c5dfb14fc30e5ef2969233ce296c3ac52a3f4bf1e14243d2862c63817d0a0c98a0f0ad3 AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737 DIST qemu-5.0.0.tar.xz 62426192 BLAKE2B 785d02ef79c95b5c4f0556186054885f9893d4e8a9f4b4f2d6199a4e1ae9c31d7c79dd900305469217f85d61bbe74134b601d5c6c1b0eee2b74792d010f1fd63 SHA512 21ef0cbe107c468a40f0fa2635db2a40048c8790b629dfffca5cd62bb1b502ea8eb133bfc40df5ecf1489e2bffe87f6829aee041cb8a380ff04a8afa23b39fcf DIST qemu-5.1.0.tar.xz 62911540 BLAKE2B 6a3ecbda2d9274f2736ffbc88d2006be31f153e7687e1425c1a297975f0e828cd2eafc11d11b589991acda87a489dd256ccf5a8947f91bb9431e515e979d8f29 SHA512 e213edb71d93d5167ddce7546220ecb7b52a7778586a4f476f65bd1e510c9cfc6d1876238a7b501d9cc3fd31cc2ae4b7fb9e753bc3f12cc17cd16dfce2a96ba3 EBUILD qemu-5.0.0-r2.ebuild 24815 BLAKE2B b741752821f2619c6bbafde012ec16649f3e4a579466227cfe52eb88a4cd17046414b9e2d2a39741c06cb4e69d2c2c6939a3bb80cb649e670ce845975174a348 SHA512 1b8258168b79e140d0819fd516eb8c63edc6611584526d8f5959955eebbf335daa36a099549fbf2539e6506c051eb46134caa9ab7c72ed602c704e2ef9c93813 -EBUILD qemu-5.1.0.ebuild 24822 BLAKE2B dfabce0b7141a620e51c54412c556e55dccff4656351497f19b8eacf6b3fd03dca3920ff507eb247e781dd33b8a52de64876baaafb9ea73698128f66677a07d0 SHA512 46f7adad65c727150f1e501098d3c5263b91c7bbb5625f57ee61cc339d300e4bd13768617472098a93ab8430856a8ccb2dd064418428288689a5d72127bb291c -EBUILD qemu-9999.ebuild 24822 BLAKE2B dfabce0b7141a620e51c54412c556e55dccff4656351497f19b8eacf6b3fd03dca3920ff507eb247e781dd33b8a52de64876baaafb9ea73698128f66677a07d0 SHA512 46f7adad65c727150f1e501098d3c5263b91c7bbb5625f57ee61cc339d300e4bd13768617472098a93ab8430856a8ccb2dd064418428288689a5d72127bb291c +EBUILD qemu-5.1.0.ebuild 24820 BLAKE2B 4482ca0fa9ca3647fb5a1f1470fb865ceea7e17b846fc4037cdcc7e1ed02c6aa751bfad152dcdf3ccdd73d15b44733bfd2447f5b2636f340b80cf6ba458a5c49 SHA512 577d0d18d09cbdfac8cee7e506978a90915d4e58429cde11d06b377484c837e5d6d3c0dca550592af7ded8b7914d1b5cfd9aaf444dd921ba7e8487a10d86290b +EBUILD qemu-9999.ebuild 24950 BLAKE2B 5d701f040d80e67bbf6fc31f1f5e817f45a0d1fe28722b3e542caa64f1e478e42eec57d0ec2d7c883bcfcef1b6981902b99cd35a10e664df6fac842eea345e06 SHA512 841387f56f504c1a334be45b43238625f451875bd978ec8164ada84f1af4439238ed3b34ab6cd729d98329f18a646f9f5e1e19c773a9b5c5888f8fb547a513c9 MISC metadata.xml 4677 BLAKE2B 82b6a32773d1ab6ffbb7be0461c0f53b916621d470290d2b2ec986346eb8d8c283ae2dd95a94f5a56d3ff59e602be1d7d5f53c0a41e722df20cc266172ca5805 SHA512 edd256d976b9f3bc5f0e37802286a859a069e07458491e8a12ff4333291f76477f1ab6c4a733ca3778121cc52b237c5fcbaa0645546dbdc3afc51217b55162ac diff --git a/app-emulation/qemu/files/qemu-9999-cflags.patch b/app-emulation/qemu/files/qemu-9999-cflags.patch new file mode 100644 index 000000000000..1c732a453a91 --- /dev/null +++ b/app-emulation/qemu/files/qemu-9999-cflags.patch @@ -0,0 +1,12 @@ +--- a/configure ++++ b/configure +@@ -6349,9 +6349,6 @@ if test "$debug_info" = "yes"; then + CFLAGS="-g $CFLAGS" + LDFLAGS="-g $LDFLAGS" + fi +-if test "$debug" = "no"; then +- CFLAGS="-O2 $CFLAGS" +-fi + + case "$ARCH" in + alpha) diff --git a/app-emulation/qemu/files/qemu-9999-format-error.patch b/app-emulation/qemu/files/qemu-9999-format-error.patch new file mode 100644 index 000000000000..8bb4d96b77cf --- /dev/null +++ b/app-emulation/qemu/files/qemu-9999-format-error.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/740836 +--- a/meson.build ++++ b/meson.build +@@ -255,8 +255,8 @@ if sdl.found() + method: 'pkg-config', static: enable_static) + else + if get_option('sdl_image').enabled() +- error('sdl-image required, but SDL was @0@', +- get_option('sdl').disabled() ? 'disabled' : 'not found') ++ error('sdl-image required, but SDL was @0@'.format( ++ get_option('sdl').disabled() ? 'disabled' : 'not found')) + endif + sdl_image = not_found + endif diff --git a/app-emulation/qemu/qemu-5.1.0.ebuild b/app-emulation/qemu/qemu-5.1.0.ebuild index 5564dc4c8420..38dc153619ed 100644 --- a/app-emulation/qemu/qemu-5.1.0.ebuild +++ b/app-emulation/qemu/qemu-5.1.0.ebuild @@ -23,7 +23,7 @@ if [[ ${PV} = *9999* ]]; then SRC_URI="" else SRC_URI="https://download.qemu.org/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" + KEYWORDS="~amd64 arm64 ~ppc ~ppc64 x86" fi DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" 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) -- cgit v1.2.3