summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-03-09 20:55:53 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-11 06:27:00 -0700
commit0fffb6a8d896ee9055341c0033b6129d5d101ee4 (patch)
tree3b0a561cca8f3962ddf16ab5d5564aab5658ba1a /meta/recipes-devtools
parent81995e2a0e0468b3a14cf85c40d9cd7a01b55a76 (diff)
downloadpoky-0fffb6a8d896ee9055341c0033b6129d5d101ee4.tar.gz
qemu: drop already applied glibc-2.25.patch
Due to patch fuzz it was applied again in a different place. (From OE-Core rev: c1596c6a26bc099a5f27f8a7f9feb7d07bd30cd5) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/qemu/qemu/glibc-2.25.patch74
-rw-r--r--meta/recipes-devtools/qemu/qemu_2.11.1.bb1
2 files changed, 0 insertions, 75 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/glibc-2.25.patch b/meta/recipes-devtools/qemu/qemu/glibc-2.25.patch
deleted file mode 100644
index 25569449e4..0000000000
--- a/meta/recipes-devtools/qemu/qemu/glibc-2.25.patch
+++ /dev/null
@@ -1,74 +0,0 @@
1From: Christopher Covington
2Date: Wed, 28 Dec 2016 15:04:33 -0500
3Subject: [Qemu-devel] [PATCH v3] build: include sys/sysmacros.h for major() and minor()a
4
5The definition of the major() and minor() macros are moving within glibc to
6<sys/sysmacros.h>. Include this header when it is available to avoid the
7following sorts of build-stopping messages:
8
9qga/commands-posix.c: In function ‘dev_major_minor’:
10qga/commands-posix.c:656:13: error: In the GNU C Library, "major" is defined
11 by <sys/sysmacros.h>. For historical compatibility, it is
12 currently defined by <sys/types.h> as well, but we plan to
13 remove this soon. To use "major", include <sys/sysmacros.h>
14 directly. If you did not intend to use a system-defined macro
15 "major", you should undefine it after including <sys/types.h>. [-Werror]
16 *devmajor = major(st.st_rdev);
17 ^~~~~~~~~~~~~~~~~~~~~~~~~~
18
19qga/commands-posix.c:657:13: error: In the GNU C Library, "minor" is defined
20 by <sys/sysmacros.h>. For historical compatibility, it is
21 currently defined by <sys/types.h> as well, but we plan to
22 remove this soon. To use "minor", include <sys/sysmacros.h>
23 directly. If you did not intend to use a system-defined macro
24 "minor", you should undefine it after including <sys/types.h>. [-Werror]
25 *devminor = minor(st.st_rdev);
26 ^~~~~~~~~~~~~~~~~~~~~~~~~~
27
28The additional include allows the build to complete on Fedora 26 (Rawhide)
29with glibc version 2.24.90.
30
31Signed-off-by: Christopher Covington <address@hidden>
32Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
33
34Upstream-Status: Submitted https://lists.gnu.org/archive/html/qemu-devel/2016-12/msg03548.html
35
36diff -uNr qemu-2.8.0.orig/configure qemu-2.8.0/configure
37--- qemu-2.8.0.orig/configure 2017-02-21 19:05:13.180094708 +0100
38+++ qemu-2.8.0/configure 2017-02-21 19:08:53.114087084 +0100
39@@ -4727,6 +4727,20 @@
40 then
41 fi
42
43 ##########################################
44+# check for sysmacros.h
45+
46+have_sysmacros=no
47+cat > $TMPC << EOF
48+#include <sys/sysmacros.h>
49+int main(void) {
50+ return makedev(0, 0);
51+}
52+EOF
53+if compile_prog "" "" ; then
54+ have_sysmacros=yes
55+fi
56+
57+##########################################
58 # End of CC checks
59 # After here, no more $cc or $ld runs
60
61diff -uNr qemu-2.8.0.orig/configure qemu-2.8.0/configure
62--- qemu-2.8.0.orig/configure 2017-02-21 19:05:13.180094708 +0100
63+++ qemu-2.8.0/configure 2017-02-21 19:08:53.114087084 +0100
64@@ -5695,6 +5709,10 @@
65 echo "CONFIG_AF_VSOCK=y" >> $config_host_mak
66 fi
67
68+if test "$have_sysmacros" = "yes" ; then
69+ echo "CONFIG_SYSMACROS=y" >> $config_host_mak
70+fi
71+
72 # Hold two types of flag:
73 # CONFIG_THREAD_SETNAME_BYTHREAD - we've got a way of setting the name on
74 # a thread we have a handle to
diff --git a/meta/recipes-devtools/qemu/qemu_2.11.1.bb b/meta/recipes-devtools/qemu/qemu_2.11.1.bb
index f0e20cc125..90eeee95c5 100644
--- a/meta/recipes-devtools/qemu/qemu_2.11.1.bb
+++ b/meta/recipes-devtools/qemu/qemu_2.11.1.bb
@@ -17,7 +17,6 @@ SRC_URI = "http://wiki.qemu-project.org/download/${BP}.tar.bz2 \
17 file://no-valgrind.patch \ 17 file://no-valgrind.patch \
18 file://pathlimit.patch \ 18 file://pathlimit.patch \
19 file://qemu-2.5.0-cflags.patch \ 19 file://qemu-2.5.0-cflags.patch \
20 file://glibc-2.25.patch \
21 file://chardev-connect-socket-to-a-spawned-command.patch \ 20 file://chardev-connect-socket-to-a-spawned-command.patch \
22 file://apic-fixup-fallthrough-to-PIC.patch \ 21 file://apic-fixup-fallthrough-to-PIC.patch \
23 file://linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \ 22 file://linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \