diff options
Diffstat (limited to 'meta/recipes-devtools/qemu/files')
-rw-r--r-- | meta/recipes-devtools/qemu/files/fix-configure-checks.patch | 10 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/files/relocatable_sdk.patch | 16 |
2 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-devtools/qemu/files/fix-configure-checks.patch b/meta/recipes-devtools/qemu/files/fix-configure-checks.patch index ef77c92842..294c22019d 100644 --- a/meta/recipes-devtools/qemu/files/fix-configure-checks.patch +++ b/meta/recipes-devtools/qemu/files/fix-configure-checks.patch | |||
@@ -8,14 +8,14 @@ Patch from Paul Eggleton, Comments by RP 28/11/10 | |||
8 | 8 | ||
9 | Upstream-Status: Inappropriate [embedded specific] | 9 | Upstream-Status: Inappropriate [embedded specific] |
10 | 10 | ||
11 | Index: qemu-1.2.0/configure | 11 | Index: qemu-1.4.0/configure |
12 | =================================================================== | 12 | =================================================================== |
13 | --- qemu-1.2.0.orig/configure 2012-09-05 07:03:06.000000000 -0700 | 13 | --- qemu-1.4.0.orig/configure 2013-02-15 15:05:35.000000000 -0800 |
14 | +++ qemu-1.2.0/configure 2012-09-06 13:55:07.007793823 -0700 | 14 | +++ qemu-1.4.0/configure 2013-02-25 13:44:17.915273181 -0800 |
15 | @@ -281,6 +281,7 @@ | 15 | @@ -286,6 +286,7 @@ |
16 | QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS" | 16 | QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS" |
17 | QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS" | 17 | QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS" |
18 | QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/fpu" | 18 | QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/include" |
19 | +QEMU_CFLAGS="$QEMU_CFLAGS $CFLAGS" | 19 | +QEMU_CFLAGS="$QEMU_CFLAGS $CFLAGS" |
20 | if test "$debug_info" = "yes"; then | 20 | if test "$debug_info" = "yes"; then |
21 | CFLAGS="-g $CFLAGS" | 21 | CFLAGS="-g $CFLAGS" |
diff --git a/meta/recipes-devtools/qemu/files/relocatable_sdk.patch b/meta/recipes-devtools/qemu/files/relocatable_sdk.patch index 0a01a8a048..774a49c774 100644 --- a/meta/recipes-devtools/qemu/files/relocatable_sdk.patch +++ b/meta/recipes-devtools/qemu/files/relocatable_sdk.patch | |||
@@ -6,11 +6,11 @@ the new path (4096 is the maximum path length in Linux). | |||
6 | 6 | ||
7 | Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> | 7 | Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> |
8 | 8 | ||
9 | Index: qemu-1.2.0/i386.ld | 9 | Index: qemu-1.4.0/ldscripts/i386.ld |
10 | =================================================================== | 10 | =================================================================== |
11 | --- qemu-1.2.0.orig/i386.ld | 11 | --- qemu-1.4.0.orig/ldscripts/i386.ld 2013-02-15 15:05:35.000000000 -0800 |
12 | +++ qemu-1.2.0/i386.ld | 12 | +++ qemu-1.4.0/ldscripts/i386.ld 2013-02-28 22:55:36.138816418 -0800 |
13 | @@ -8,7 +8,7 @@ SECTIONS | 13 | @@ -8,7 +8,7 @@ |
14 | { | 14 | { |
15 | /* Read-only sections, merged into text segment: */ | 15 | /* Read-only sections, merged into text segment: */ |
16 | . = 0x60000000 + SIZEOF_HEADERS; | 16 | . = 0x60000000 + SIZEOF_HEADERS; |
@@ -19,11 +19,11 @@ Index: qemu-1.2.0/i386.ld | |||
19 | .hash : { *(.hash) } | 19 | .hash : { *(.hash) } |
20 | .dynsym : { *(.dynsym) } | 20 | .dynsym : { *(.dynsym) } |
21 | .dynstr : { *(.dynstr) } | 21 | .dynstr : { *(.dynstr) } |
22 | Index: qemu-1.2.0/x86_64.ld | 22 | Index: qemu-1.4.0/ldscripts/x86_64.ld |
23 | =================================================================== | 23 | =================================================================== |
24 | --- qemu-1.2.0.orig/x86_64.ld | 24 | --- qemu-1.4.0.orig/ldscripts/x86_64.ld 2013-02-15 15:05:35.000000000 -0800 |
25 | +++ qemu-1.2.0/x86_64.ld | 25 | +++ qemu-1.4.0/ldscripts/x86_64.ld 2013-02-28 22:55:36.138816418 -0800 |
26 | @@ -6,7 +6,7 @@ SECTIONS | 26 | @@ -6,7 +6,7 @@ |
27 | { | 27 | { |
28 | /* Read-only sections, merged into text segment: */ | 28 | /* Read-only sections, merged into text segment: */ |
29 | . = 0x60000000 + SIZEOF_HEADERS; | 29 | . = 0x60000000 + SIZEOF_HEADERS; |