Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=8bd5ab69472a7e9e47e7f71f2897d3061ac07f4b
commit 8bd5ab69472a7e9e47e7f71f2897d3061ac07f4b Author: crazy <[email protected]> Date: Sun Feb 11 15:39:46 2018 +0100 qemu-2.11.0-3-x86_64 * rebuild with tc * added an patch to fix the build diff --git a/source/xapps-extra/qemu/FrugalBuild b/source/xapps-extra/qemu/FrugalBuild index 6724a36..cde5bdd 100644 --- a/source/xapps-extra/qemu/FrugalBuild +++ b/source/xapps-extra/qemu/FrugalBuild @@ -8,11 +8,11 @@ ## add virtgl stuff pkgname=qemu pkgver=2.11.0 -pkgrel=2 +pkgrel=3 pkgdesc="QEMU is a FAST! processor emulator" url="http://www.nongnu.org/qemu/"; depends=('libx11' 'sdl2' 'alsa-lib' 'cyrus-sasl' 'nss' 'libgl' 'pixman' \ - 'libpng>=1.6.20' 'libjpeg>=9b' 'spice-server' 'spice-protocol' \ + 'libpng>=1.6.20' 'libjpeg-turbo' 'spice-server' 'spice-protocol' \ 'usbredir>=0.7' 'pulseaudio' 'ncurses>=6.0-3' 'libglu' 'libepoxy' \ 'libaio' 'lzo' 'snappy' 'libseccomp' 'numactl' 'bluez' 'jemalloc' \ 'curl' 'nettle' 'libssh2' 'libgbm') @@ -26,13 +26,14 @@ _F_archive_grepv="rc[0-9]" up2date="Flasttar http://wiki.qemu.org/download"; source=(http://wiki.qemu.org/download/${pkgname}-${pkgver//_/-}.tar.bz2 \ qemu.conf 49-kvm.rules qemu-guest-agent.service \ - 99-qemu-guest-agent.rules README.Frugalware) + 99-qemu-guest-agent.rules README.Frugalware memfd.patch) sha1sums=('964df3a183036982469e80194b181bd7c658dfab' \ 'b44a774fe5ebcf52275ee0fc33a9654c157204ca' \ '9d9f293fb01d91c12e2f95ba6401a1f1570d70fb' \ '435373031bc0a1fed8abadab912460ddf98bc1c2' \ 'c997e6afd997aeb87791664c2583a009704a6792' \ - '11fea2f36b44297e241d8cbbdbc4cd14f1150b72') + '11fea2f36b44297e241d8cbbdbc4cd14f1150b72' \ + '85b5346866f55b28f5e45d95dc5e06413f8d6bef') subpkgs=('qemu-guest') subdescs=('Files for use in QEMU guests.') @@ -47,6 +48,7 @@ build() { Fcd $pkgname-${pkgver%%_*} + Fpatchall Fexec ./configure \ --prefix=/usr \ --audio-drv-list='pa alsa sdl' \ diff --git a/source/xapps-extra/qemu/memfd.patch b/source/xapps-extra/qemu/memfd.patch new file mode 100644 index 0000000..f5dea85 --- /dev/null +++ b/source/xapps-extra/qemu/memfd.patch @@ -0,0 +1,47 @@ +Recent glibc added memfd_create in sys/mman.h. This conflicts with +the definition in util/memfd.c: + + /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static +declaration of memfd_create follows non-static declaration + +Fix the configure test, and remove the sys/memfd.h inclusion since the +file actually does not exist---it is a typo in the memfd_create(2) man +page. + +Cc: Marc-André Lureau <address@hidden> +Signed-off-by: Paolo Bonzini <address@hidden> +--- + configure | 2 +- + util/memfd.c | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index e31d6a7fee..11eac205ec 100755 +--- a/configure ++++ b/configure +@@ -3910,7 +3910,7 @@ fi + # check if memfd is supported + memfd=no + cat > $TMPC << EOF +-#include <sys/memfd.h> ++#include <sys/mman.h> + + int main(void) + { +diff --git a/util/memfd.c b/util/memfd.c +index 4571d1aba8..412e94a405 100644 +--- a/util/memfd.c ++++ b/util/memfd.c +@@ -31,9 +31,7 @@ + + #include "qemu/memfd.h" + +-#ifdef CONFIG_MEMFD +-#include <sys/memfd.h> +-#elif defined CONFIG_LINUX ++#if defined CONFIG_LINUX && !defined CONFIG_MEMFD + #include <sys/syscall.h> + #include <asm/unistd.h> + +-- +2.14.3 \ No newline at end of file
_______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
