vars/build.vars:native_packages_etc: adds qemu v3.1.0 (via Redfoxmoon.)

patches/qemu-3.1.0.local.patch: via Redfoxmoon.

2 files changed, 103 insertions, 1 deletions

diff --git a/patches/qemu-3.1.0.local.patch b/patches/qemu-3.1.0.local.patch
new file mode 100644
index 00000000..47b88552
--- /dev/null
+++ b/patches/qemu-3.1.0.local.patch
@@ -0,0 +1,98 @@
+diff -ru qemu-3.1.0.orig/block/file-posix.c qemu-3.1.0/block/file-posix.c
+--- qemu-3.1.0.orig/block/file-posix.c	2018-12-11 18:44:34.000000000 +0100
++++ qemu-3.1.0/block/file-posix.c	2019-01-26 16:56:01.445730665 +0100
+@@ -68,6 +68,9 @@
+ #ifdef __s390__
+ #include <asm/dasd.h>
+ #endif
++#ifdef __midipix__
++#include <sys/ioctl.h>
++#endif
+ #ifndef FS_NOCOW_FL
+ #define FS_NOCOW_FL                     0x00800000 /* Do not cow file */
+ #endif
+diff -ru qemu-3.1.0.orig/configure qemu-3.1.0/configure
+--- qemu-3.1.0.orig/configure	2018-12-11 18:44:34.000000000 +0100
++++ qemu-3.1.0/configure	2019-01-26 17:14:57.534041555 +0100
+@@ -631,6 +631,8 @@
+ 
+ if check_define __linux__ ; then
+   targetos="Linux"
++elif check_define __midipix__ ; then
++  targetos='Midipix'
+ elif check_define _WIN32 ; then
+   targetos='MINGW32'
+ elif check_define __OpenBSD__ ; then
+@@ -882,6 +884,10 @@
+   supported_os="yes"
+   libudev="yes"
+ ;;
++Midipix)
++  midipix="yes"
++  supported_os="yes"
++;;
+ esac
+ 
+ if [ "$bsd" = "yes" ] ; then
+@@ -4361,7 +4367,7 @@
+ }
+ EOF
+ if compile_prog "" "" ; then
+-  epoll=yes
++  epoll=no
+ fi
+ 
+ # epoll_create1 is a later addition
+@@ -4384,7 +4390,7 @@
+ }
+ EOF
+ if compile_prog "" "" ; then
+-  epoll_create1=yes
++  epoll_create1=no
+ fi
+ 
+ # check for sendfile support
+@@ -5254,7 +5260,7 @@
+ 
+ vector16=no
+ if compile_prog "" "" ; then
+-  vector16=yes
++  vector16=no
+ fi
+ 
+ ########################################
+diff -ru qemu-3.1.0.orig/util/oslib-posix.c qemu-3.1.0/util/oslib-posix.c
+--- qemu-3.1.0.orig/util/oslib-posix.c	2018-12-11 18:44:35.000000000 +0100
++++ qemu-3.1.0/util/oslib-posix.c	2019-01-26 17:06:42.283833497 +0100
+@@ -43,6 +43,10 @@
+ #include <sys/syscall.h>
+ #endif
+ 
++#ifdef __midipix__
++#include <sys/syscall.h>
++#endif
++
+ #ifdef __FreeBSD__
+ #include <sys/sysctl.h>
+ #include <sys/user.h>
+@@ -76,7 +80,7 @@
+ 
+ int qemu_get_thread_id(void)
+ {
+-#if defined(__linux__)
++#if defined(__linux__) || defined(__midipix__)
+     return syscall(SYS_gettid);
+ #else
+     return getpid();
+diff -ru qemu-3.1.0.orig/util/qemu-openpty.c qemu-3.1.0/util/qemu-openpty.c
+--- qemu-3.1.0.orig/util/qemu-openpty.c	2018-12-11 18:44:35.000000000 +0100
++++ qemu-3.1.0/util/qemu-openpty.c	2019-01-26 17:07:10.487735991 +0100
+@@ -35,7 +35,7 @@
+ #include "qemu/osdep.h"
+ #include "qemu-common.h"
+ 
+-#if defined(__GLIBC__)
++#if defined(__GLIBC__) || defined(__midipix__)
+ # include <pty.h>
+ #elif defined CONFIG_BSD
+ # include <termios.h>
diff --git a/vars/build.vars b/vars/build.vars
index 37a75e43..d1f5b8b4 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -1227,7 +1227,7 @@ bdwgc bison chicken cparser diffutils flex lunix m4 make mandoc nasm patch patch
 # Packages list native_packages_etc
 NATIVE_PACKAGES_ETC_PACKAGES="
 ca_certificates cron dante debianutils emacs fetchmail ffmpeg gnuchess hexcurse htop icecast isync infounzip
-infozip jamvm classpath john less mlogin mc mintty nano ncdu p7zip procps_ng qpdf rdesktop rw rxvt_unicode st
+infozip jamvm classpath john less mlogin mc mintty nano ncdu p7zip procps_ng qemu qpdf rdesktop rw rxvt_unicode st
 tmux tzdb vim xcowsay xeyes xorriso xterm xwd";
 : ${PKG_CA_CERTIFICATES_URLS_GIT:="ca-certificates=https://github.com/Redfoxmoon3/ca-certificates@master"};
 : ${PKG_CA_CERTIFICATES_IN_TREE:=1};
@@ -1343,6 +1343,10 @@ fi;
 : ${PKG_PROCPS_NG_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/ncursesw};
 : ${PKG_PROCPS_NG_FNAME:=procps_ng-${PKG_PROCPS_NG_VERSION}.tar.gz};
 : ${PKG_PROCPS_NG_SUBDIR:=procps-v${PKG_PROCPS_NG_VERSION}-7bb949bcba13c107fa0f45d2d0298b1ad6b6d6cc};
+: ${PKG_QEMU_SHA256SUM:=6a0508df079a0a33c2487ca936a56c12122f105b8a96a44374704bef6c69abfc};
+: ${PKG_QEMU_VERSION:=3.1.0};
+: ${PKG_QEMU_URL:=https://download.qemu.org/qemu-${PKG_QEMU_VERSION}.tar.xz};
+: ${PKG_QEMU_CONFIGURE_ARGS:="--host=${DEFAULT_TARGET} --prefix="" --cc=${DEFAULT_TARGET}-gcc --disable-strip"};
 : ${PKG_QPDF_SHA256SUM:=a9fdc7e94d38fcd3831f37b6e0fe36492bf79aa6d54f8f66062cf7f9c4155233};
 : ${PKG_QPDF_VERSION:=6.0.0};
 : ${PKG_QPDF_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/qpdf/qpdf-${PKG_QPDF_VERSION}.tar.gz};