From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini 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 Signed-off-by: Paolo Bonzini --- 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 +#include 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 -#elif defined CONFIG_LINUX +#if defined CONFIG_LINUX && !defined CONFIG_MEMFD #include #include -- 1.8.3.1 f53a3f88884e245e962073528be46918ad2e'>diff
path: root/gnu/packages/elf.scm
AgeCommit message (Expand)Author
2022-01-30gnu: patchelf: Add release-monitoring-url....* gnu/packages/elf.scm (patchelf)[properties]: New field. Efraim Flashner
2022-01-27gnu: elfutils: Fix building on riscv64-linux....* gnu/packages/elf.scm (elfutils)[arguments]: On riscv64-linux add a phase to skip failing test. Efraim Flashner
2021-12-13gnu: Simplify package inputs....This commit was obtained by running: ./pre-inst-env guix style without any additional argument. Ludovic Courtès
2021-07-14libelf: Update configure script and config.guess and config.sub....The current configure script is too old to find the cross-compiler and support variables passed as arguments. Also, config.guess and config.sub are too old to recognise powerpc64 and aarch64. Solve this by regenerating the 'configure' script and replacing 'config.guess' and 'config.sub'. * gnu/packages/elf.scm (libelf)[arguments]<#:phases>{configure}: Remove phase. (libelf)[arguments]<#:phases>{delete-configure}: Regenerate the configure script and replace 'config.guess' and 'config.sub'. Signed-off-by: Mathieu Othacehe <othacehe@gnu.org> Maxime Devos
2021-05-09gnu: elfutils: Omit static libraries....* gnu/packages/elf.scm (elfutils)[arguments]: Add "--disable-static" to #:configure-flags. Marius Bakke
2021-05-09gnu: elfutils: Update to 0.183....* gnu/packages/elf.scm (elfutils): Update to 0.183. Marius Bakke
2021-03-23gnu: libelf: Fix compilation for powerpc64le-linux....* gnu/packages/elf.scm (libelf)[arguments]: Modify replacement 'configure phase to invoke "./configure" with "--host=powerpc64le-unknown-linux-gnu" on powerpc64le-linux. Signed-off-by: Chris Marusich <cmmarusich@gmail.com> Leo Le Bouter
2021-01-25Merge branch 'master' into stagingLeo Famulari