Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 451178 - app-emulation/qemu-9999 - Fails to apply qemu-1.2.0-cflags.patch
Summary: app-emulation/qemu-9999 - Fails to apply qemu-1.2.0-cflags.patch
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Doug Goldstein (RETIRED)
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-01-10 12:58 UTC by Michal Privoznik
Modified: 2013-01-10 21:05 UTC (History)
2 users (show)

See Also:
Package list:
Runtime testing required: ---

Attachments
qemu-9999.ebuild.patch (file_451178.txt,479 bytes, text/plain)
2013-01-10 13:00 UTC, Tom Wijsman (TomWij) (RETIRED) 		Details
qemu-9999-cflags.patch (file_451178.txt,354 bytes, text/plain)
2013-01-10 13:01 UTC, Tom Wijsman (TomWij) (RETIRED) 		Details
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Michal Privoznik 2013-01-10 12:58:36 UTC 
In fact, it's qemu-1.2.0-cflags.patch which fails to apply since the 'configure' file it is patching has changed. Well, in the git, not the release. So we need something like this:


--- a/qemu-9999.ebuild    2013-01-10 13:56:35.491114288 +0100
+++ b/qemu-9999.ebuild    2013-01-10 13:56:39.631205019 +0100
@@ -189,7 +189,7 @@
 
        python_convert_shebangs -r 2 "${S}/scripts/kvm/kvm_stat"
 
-       epatch "${FILESDIR}"/qemu-1.2.0-cflags.patch
+       epatch "${FILESDIR}"/qemu-9999-cflags.patch
        [[ -n ${BACKPORTS} ]] && \
                EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
                        epatch


and add the qemu-9999-cflags.patch file into 'files' dir:

diff --git a/configure b/configure
index 82f6e71..7e19aaf 100755
--- a/configure
+++ b/configure
@@ -3131,8 +3131,6 @@ fi
 if test "$gcov" = "yes" ; then
   CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS"
   LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS"
-elif test "$debug" = "no" ; then
-  CFLAGS="-O2 -D_FORTIFY_SOURCE=2 $CFLAGS"
 fi


Then we will build successfully.
Comment 1 Tom Wijsman (TomWij) (RETIRED) gentoo-dev 2013-01-10 13:00:28 UTC 
Created attachment 335068 [details]
qemu-9999.ebuild.patch

Patch attached so it can be downloaded.
Comment 2 Tom Wijsman (TomWij) (RETIRED) gentoo-dev 2013-01-10 13:01:11 UTC 
Created attachment 335070 [details]
qemu-9999-cflags.patch

Patch attached so it can be downloaded.
Comment 3 Sergei Trofimovich (RETIRED) gentoo-dev 2013-01-10 21:05:27 UTC 
Pushed to the tree:

> 10 Jan 2013; Sergei Trofimovich <slyfox@gentoo.org>
> +files/qemu-9999-cflags.patch, qemu-9999.ebuild:
> Refresh cflags patch by Michal Privoznik and by Tom Wijsman (bug #451178).

Thanks guys!