Ver Fonte

fix qemu build for older kernels

Waldemar Brodkorb há 10 anos atrás
pai
commit
174df1bc12
2 ficheiros alterados com 15 adições e 4 exclusões
  1. 1 1
      package/qemu/Makefile
  2. 14 3
      package/qemu/patches/patch-linux-user_syscall_c

+ 1 - 1
package/qemu/Makefile

@@ -10,7 +10,7 @@ PKG_MD5SUM:=		32893941d40d052a5e649efcf06aca06
 PKG_DESCR:=		cpu and system emulator
 PKG_SECTION:=		misc
 PKG_DEPENDS:=		zlib libsdl libpng
-PKG_BUILDDEP:=		glib-host qemu-host zlib sdl libpng
+PKG_BUILDDEP:=		gettext-tiny libiconv-tiny glib-host qemu-host zlib sdl libpng
 PKG_URL:=		http://wwww.qemu.org/
 PKG_SITES:=		http://wiki.qemu.org/download/
 

+ 14 - 3
package/qemu/patches/patch-linux-user_syscall_c

@@ -1,11 +1,22 @@
 --- qemu-1.7.0.orig/linux-user/syscall.c	2013-11-27 23:15:55.000000000 +0100
-+++ qemu-1.7.0/linux-user/syscall.c	2014-01-30 12:14:53.751964593 +0100
-@@ -94,7 +94,7 @@ int __clone2(int (*fn)(void *), void *ch
++++ qemu-1.7.0/linux-user/syscall.c	2014-01-31 09:51:34.051058876 +0100
+@@ -64,6 +64,7 @@ int __clone2(int (*fn)(void *), void *ch
+ #include <netinet/ip.h>
+ #include <netinet/tcp.h>
+ #include <linux/wireless.h>
++#include <linux/version.h>
+ #include <linux/icmp.h>
+ #include "qemu-common.h"
+ #ifdef TARGET_GPROF
+@@ -94,7 +95,11 @@ int __clone2(int (*fn)(void *), void *ch
  #include <linux/utsname.h>
  #include <linux/cdrom.h>
  #include <linux/hdreg.h>
--#include <linux/soundcard.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,11,0)
+ #include <linux/soundcard.h>
++#else
 +#include <linux/soundcard.h.oss3>
++#endif
  #include <linux/kd.h>
  #include <linux/mtio.h>
  #include <linux/fs.h>