diff options
Diffstat (limited to 'recipes-extended/xen/xen-hg/tools_qemu_xen_remove_CFLAGS.patch')
| -rw-r--r-- | recipes-extended/xen/xen-hg/tools_qemu_xen_remove_CFLAGS.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/recipes-extended/xen/xen-hg/tools_qemu_xen_remove_CFLAGS.patch b/recipes-extended/xen/xen-hg/tools_qemu_xen_remove_CFLAGS.patch deleted file mode 100644 index 5fd01480..00000000 --- a/recipes-extended/xen/xen-hg/tools_qemu_xen_remove_CFLAGS.patch +++ /dev/null | |||
| @@ -1,48 +0,0 @@ | |||
| 1 | # HG changeset patch | ||
| 2 | # User Olaf Hering <olaf@xxxxxxxxx> | ||
| 3 | # Date 1330015545 -3600 | ||
| 4 | # Node ID 5bdbdcb03d60a7b58f41306ef39cb988100efbe4 | ||
| 5 | # Parent 56214b978466914c1b9f8adb1158a3217a823e42 | ||
| 6 | tools/qemu-xen: remove CFLAGS for qemu build | ||
| 7 | |||
| 8 | Currently qemu-xen gets build with CFLAGS only if CFLAGS was already in | ||
| 9 | the environment during make invocation. If CFLAGS is in environment then | ||
| 10 | make will append all of the various flags specified in xen Makefiles, | ||
| 11 | which is then passed to qemu configure. If CFLAGS is not set, then | ||
| 12 | configure will use just "-O2 -g" because make does not export its own | ||
| 13 | CFLAGS variable. | ||
| 14 | |||
| 15 | To make qemu-xen build consistent this change removes CFLAGS from the | ||
| 16 | environment so that only the CFLAGS from qemu configure script will be | ||
| 17 | used. This matches what is done in kvm.rpm and qemu.rpm where for | ||
| 18 | example RPM_OPT_FLAGS is not passes as CFLAGS. Otherwise those packages | ||
| 19 | would not build as well. | ||
| 20 | |||
| 21 | Passing makes CFLAGS to configure will lead to build errors: | ||
| 22 | - xen Makefiles append -std=gnu99, this breaks qemu build due to a bug | ||
| 23 | in header file: | ||
| 24 | fpu/softfloat-specialize.h:107: error: initializer element is not constant | ||
| 25 | - in 32bit builds, qemus configure script will append -mcpu=i486 in an | ||
| 26 | odd way, which leads to unknown gcc cmdline options due to a missing | ||
| 27 | space | ||
| 28 | - xen Makefiles will append -Wall which will expose all sorts of style | ||
| 29 | issues in the qemu code | ||
| 30 | - in one case some of the asm() blocks will not compile with gcc 4.6 in | ||
| 31 | openSuSE 12.1 | ||
| 32 | |||
| 33 | Until upstream qemu has fixed all these issues use no extra CFLAGS to | ||
| 34 | configure qemu-xen. | ||
| 35 | |||
| 36 | Signed-off-by: Olaf Hering <olaf@xxxxxxxxx> | ||
| 37 | |||
| 38 | diff -r 56214b978466 -r 5bdbdcb03d60 tools/Makefile | ||
| 39 | --- a/tools/Makefile | ||
| 40 | +++ b/tools/Makefile | ||
| 41 | @@ -146,6 +146,7 @@ | ||
| 42 | source=.; \ | ||
| 43 | fi; \ | ||
| 44 | cd qemu-xen-dir; \ | ||
| 45 | + env -u CFLAGS | ||
| 46 | $$source/configure --enable-xen --target-list=i386-softmmu \ | ||
| 47 | --source-path=$$source \ | ||
| 48 | --extra-cflags="-I$(XEN_ROOT)/tools/include \ | ||
