From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <pbonzini@redhat.com>
Date: Tue, 28 Nov 2017 11:51:27 +0100
Subject: [PATCH] memfd: fix configure test
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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 <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 configure    | 2 +-
 util/memfd.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 9c8aa5a..99ccc17 100755
--- a/configure
+++ b/configure
@@ -3923,7 +3923,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 4571d1a..412e94a 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>
 
-- 
1.8.3.1

.scm?id=0897ad7fac04fc9d814e83eed46e88c7bf9740bc'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/julia.scm'>
<input type='hidden' name='id' value='0897ad7fac04fc9d814e83eed46e88c7bf9740bc'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=0897ad7fac04fc9d814e83eed46e88c7bf9740bc'>root</a>/<a href='/guix/log/gnu?id=0897ad7fac04fc9d814e83eed46e88c7bf9740bc'>gnu</a>/<a href='/guix/log/gnu/packages?id=0897ad7fac04fc9d814e83eed46e88c7bf9740bc'>packages</a>/<a href='/guix/log/gnu/packages/julia.scm?id=0897ad7fac04fc9d814e83eed46e88c7bf9740bc'>julia.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/julia.scm?id=0897ad7fac04fc9d814e83eed46e88c7bf9740bc&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-09-04 22:18:07 +0200'>2019-09-04</span></td><td><a href='/guix/commit/gnu/packages/julia.scm?id=11d73fb412d8728cf916eff9d9750be0bb593076'>gnu: julia: Set search path.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/julia.scm (julia)[native-search-paths]: Add
specification for JULIA_LOAD_PATH.

Signed-off-by: Julien Lepiller &lt;julien@lepiller.eu&gt;
</span></span></td><td>nixo</td></tr>
<tr><td><span title='2019-07-24 00:31:23 +0200'>2019-07-24</span></td><td><a href='/guix/commit/gnu/packages/julia.scm?id=7304d5623ab5cc35289cb1535cbd0d8a37691fac'>gnu: julia: Update to 1.1.1.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/julia.scm (libuv-julia): Update to commit 26dbe56.
(libunwind-for-julia): Remove.
(llvm-patch-url, llvm-patch): New procedures.
(llvm-julia): New variable.
(julia): Update to 1.1.1.
[arguments]: Adjust 'prepare-deps' to new set of dependencies.
Adjust 'hardcode-soname-map': remove openlibm and libfftw handling.
Update file names in 'fix-include-and-link-paths' and 'hardcode-paths'.
Adjust 'disable-broken-tests'.
Pass PREFIX, LIBFLAS, and LIBBLASNAME in #:make-flags; update other
flags.
[inputs]: Replace LLVM-3.9.1 with LLVM-JULIA.  Replace
LIBUNWIND-FOR-JULIA with LIBUNWIND.  Add "rmath" and "libwhich".
[native-inputs]: Remove "unicode-data".

Co-authored-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Nicolò Balzarotti</td></tr>
<tr><td><span title='2019-03-13 23:12:43 +0100'>2019-03-13</span></td><td><a href='/guix/commit/gnu/packages/julia.scm?id=59e80445882f8b0379e54916f89510c0deda6698'>Remove traces of "GuixSD".</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/bootloader/extlinux.scm (extlinux-configuration-file): Remove
mentions of "GuixSD".
* gnu/bootloader/grub.scm (install-grub-efi): Likewise.
* gnu/build/vm.scm (make-iso9660-image): Change default #:volume-id to
"Guix_image".
(initialize-hard-disk): Search for the "Guix_image" label.
* gnu/ci.scm (system-test-jobs, tarball-jobs): Remove "GuixSD".
* gnu/installer/newt/welcome.scm (run-welcome-page): Likewise.
* gnu/packages/audio.scm (supercollider)[description]: Likewise.
* gnu/packages/curl.scm (curl): Likewise.
* gnu/packages/emacs.scm (emacs): Likewise.
* gnu/packages/gnome.scm (network-manager): Likewise.
* gnu/packages/julia.scm (julia): Likewise.
* gnu/packages/linux.scm (alsa-plugins): Likewise.
(powertop, wireless-regdb): Likewise.
* gnu/packages/package-management.scm (guix): Likewise.
* gnu/packages/polkit.scm (polkit): Likewise.
* gnu/packages/tex.scm (texlive-bin): Likewise.
* gnu/services/base.scm (file-systems-&gt;fstab): Likewise.
* gnu/services/cups.scm (%cups-activation): Likewise.
* gnu/services/mail.scm (%dovecot-activation): Likewise.
* gnu/services/messaging.scm (prosody-configuration)[log]: Likewise.
* gnu/system/examples/vm-image.tmpl (vm-image-motd): Likewise.
* gnu/system/install.scm (installation-os)[file-systems]: Change root
file system label to "Guix_image".
* gnu/system/mapped-devices.scm (check-device-initrd-modules):
Remove "GuixSD".
* gnu/system/vm.scm (system-docker-image): Likewise.
(system-disk-image)[root-label]: Change to "Guix_image".
* gnu/tests/install.scm (run-install): Remove "GuixSD".
* guix/modules.scm (guix-module-name?): Likewise.
* nix/libstore/optimise-store.cc: Likewise.
</span></span></td><td>Ludovic Courtès</td></tr>