diff options
| author |   Michal Privoznik <mprivozn@redhat.com> | 2020-01-29 14:38:40 +0100 |
|---|---|---|
| committer |   Matthias Maier <tamiko@gentoo.org> | 2020-02-06 09:45:26 -0600 |
| commit | 1cb7f069622fe60699a533f23d755e091038f0f2 (patch) | |
| tree | ad47e9b10935743095b1f1e5c9a42a77a3c7c225 /app-emulation | |
| parent | kde-apps: Add KDE Release Service 19.12.2 (diff) | |
| download | gentoo-1cb7f069622fe60699a533f23d755e091038f0f2.tar.gz gentoo-1cb7f069622fe60699a533f23d755e091038f0f2.tar.bz2 gentoo-1cb7f069622fe60699a533f23d755e091038f0f2.zip | |
app-emulation/qemu-9999: Adapt to current master
There are two changes necessary for our live ebuild. The first
one consists of rebasing qemu-2.5.0-cflags.patch because the
configure file it's patching has diverged too much.
The second change removes qemu-2.5.0-sysmacros.patch from the
list of patches for its needlessness.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Matthias Maier <tamiko@gentoo.org>
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/qemu/files/qemu-4.2.0-cflags.patch | 16 | ||||
| -rw-r--r-- | app-emulation/qemu/qemu-9999.ebuild | 3 |
2 files changed, 17 insertions, 2 deletions
diff --git a/app-emulation/qemu/files/qemu-4.2.0-cflags.patch b/app-emulation/qemu/files/qemu-4.2.0-cflags.patch new file mode 100644 index 000000000000..101926589a61 --- /dev/null +++ b/app-emulation/qemu/files/qemu-4.2.0-cflags.patch @@ -0,0 +1,16 @@ +diff --git i/configure w/configure +index a72a5def57..546d757603 100755 +--- i/configure ++++ w/configure +@@ -6093,10 +6093,6 @@ write_c_skeleton + if test "$gcov" = "yes" ; then + QEMU_CFLAGS="-fprofile-arcs -ftest-coverage -g $QEMU_CFLAGS" + QEMU_LDFLAGS="-fprofile-arcs -ftest-coverage $QEMU_LDFLAGS" +-elif test "$fortify_source" = "yes" ; then +- CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS" +-elif test "$debug" = "no"; then +- CFLAGS="-O2 $CFLAGS" + fi + + if test "$have_asan" = "yes"; then + diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 0d029214a5d6..f872a6e7422e 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -212,10 +212,9 @@ RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-qemu )" PATCHES=( - "${FILESDIR}"/${PN}-2.5.0-cflags.patch - "${FILESDIR}"/${PN}-2.5.0-sysmacros.patch "${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 ) QA_PREBUILT=" |