Gentoo Archives: gentoo-commits

From: "Sergei Trofimovich (slyfox)" <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/qemu/files: qemu-1.0-unmagic-debug.patch qemu-1.0-unmagic-xfsctl.patch
Date: Wed, 07 Mar 2012 17:11:17
Message-Id: 20120307171057.35ED42004C@flycatcher.gentoo.org
1 slyfox 12/03/07 17:10:57
2
3 Added: qemu-1.0-unmagic-debug.patch
4 qemu-1.0-unmagic-xfsctl.patch
5 Log:
6 Added patces from upstream for '--disable-debug-info' and '--enable-xfsctl'. Fixes configure failure (bug #406851 by Markus Peloquin and others).
7
8 (Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.1 app-emulation/qemu/files/qemu-1.0-unmagic-debug.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/files/qemu-1.0-unmagic-debug.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/files/qemu-1.0-unmagic-debug.patch?rev=1.1&content-type=text/plain
15
16 Index: qemu-1.0-unmagic-debug.patch
17 ===================================================================
18 commit 5bc62e01cd22ea1f56bde94b0616c46f8af2676e
19 Author: Gerd Hoffmann <kraxel@××××××.com>
20 Date: Wed Feb 8 13:54:13 2012 +0100
21
22 build: allow turning off debuginfo
23
24 This patch adds --{enable,disable}-debug-info switches to configure
25 which allows to include/exclude the '-g' switch on the gcc & ld
26 command lines. Not building debug info reduces ressource usage
27 (especially disk) alot and is quite useful for test builds.
28
29 Signed-off-by: Gerd Hoffmann <kraxel@××××××.com>
30 Signed-off-by: Anthony Liguori <aliguori@××××××.com>
31
32 diff --git a/configure b/configure
33 index a1f4a6b..b22fcda 100755
34 --- a/configure
35 +++ b/configure
36 @@ -98,6 +98,7 @@ audio_pt_int=""
37 audio_win_int=""
38 cc_i386=i386-pc-linux-gnu-gcc
39 libs_qga=""
40 +debug_info="yes"
41
42 target_list=""
43
44 @@ -207,6 +208,10 @@ for opt do
45 ;;
46 --extra-ldflags=*) LDFLAGS="$optarg $LDFLAGS"
47 ;;
48 + --enable-debug-info) debug_info="yes"
49 + ;;
50 + --disable-debug-info) debug_info="no"
51 + ;;
52 --sparc_cpu=*)
53 sparc_cpu="$optarg"
54 case $sparc_cpu in
55 @@ -244,13 +249,15 @@ sdl_config="${SDL_CONFIG-${cross_prefix}sdl-config}"
56
57 # default flags for all hosts
58 QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS"
59 -CFLAGS="-g $CFLAGS"
60 QEMU_CFLAGS="-Wall -Wundef -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS"
61 QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"
62 QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"
63 QEMU_CFLAGS="-D_FORTIFY_SOURCE=2 $QEMU_CFLAGS"
64 QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/fpu"
65 -LDFLAGS="-g $LDFLAGS"
66 +if test "$debug_info" = "yes"; then
67 + CFLAGS="-g $CFLAGS"
68 + LDFLAGS="-g $LDFLAGS"
69 +fi
70
71 # make source path absolute
72 source_path=`cd "$source_path"; pwd`
73 @@ -545,6 +552,10 @@ for opt do
74 ;;
75 --extra-ldflags=*)
76 ;;
77 + --enable-debug-info)
78 + ;;
79 + --disable-debug-info)
80 + ;;
81 --cpu=*)
82 ;;
83 --target-list=*) target_list="$optarg"
84
85
86
87 1.1 app-emulation/qemu/files/qemu-1.0-unmagic-xfsctl.patch
88
89 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/files/qemu-1.0-unmagic-xfsctl.patch?rev=1.1&view=markup
90 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/files/qemu-1.0-unmagic-xfsctl.patch?rev=1.1&content-type=text/plain
91
92 Index: qemu-1.0-unmagic-xfsctl.patch
93 ===================================================================
94 commit 8c84cf11660322489f839bc29db79bad31b4ecde
95 Author: Sergei Trofimovich <slyfox@g.o>
96 Date: Tue Jan 24 20:42:40 2012 +0300
97
98 ./configure: export xfs config via --{enable, disable}-xfsctl
99
100 Signed-off-by: Sergei Trofimovich <slyfox@g.o>
101 Signed-off-by: Stefan Hajnoczi <stefanha@××××××××××××××.com>
102
103 diff --git a/configure b/configure
104 index 9d5175b..69fb239 100755
105 --- a/configure
106 +++ b/configure
107 @@ -766,6 +766,10 @@ for opt do
108 ;;
109 --enable-rbd) rbd="yes"
110 ;;
111 + --disable-xfsctl) xfs="no"
112 + ;;
113 + --enable-xfsctl) xfs="yes"
114 + ;;
115 --disable-smartcard) smartcard="no"
116 ;;
117 --enable-smartcard) smartcard="yes"