diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2018-05-02 18:28:56 +0200 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2018-05-02 18:28:56 +0200 |
| commit | 001f5e4df0bb0c2cc21b4ab0dc620949e1ef2047 (patch) | |
| tree | 4e5b59cc1ef66c7182a4c78407bc7e98cc2f28ce | |
| parent | 883c76d55b6f4ce25482db23172ce12af31685cf (diff) | |
| download | packages-001f5e4df0bb0c2cc21b4ab0dc620949e1ef2047.tar.xz | |
extra/qemu: removed patch for glibc 2.27 (is fixed upstream)
| -rw-r--r-- | extra/qemu/PKGBUILD | 11 | ||||
| -rw-r--r-- | extra/qemu/qemu-2.11.1-glibc-2.27-mman_create.patch | 26 |
2 files changed, 0 insertions, 37 deletions
diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index 3a862424..0ccb8f88 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -13,14 +13,3 @@ eval "$( s@rm qemu/block-{iscsi,rbd,gluster}.so@rm qemu/block-{iscsi,gluster}.so@ ' )" - -# see https://git.qemu.org/?p=qemu.git;a=commit;h=75e5b70e6b5dcc4f2219992d7cffa462aa406af0 -source+=('qemu-2.11.1-glibc-2.27-mman_create.patch') -sha256sums+=('5653219a0d4ff8312e7bc4a5f6202ae637607e114e68d4c9fcf8492ab23706bb') - -eval "$( - declare -f prepare | \ - sed ' - /allow_elf64.patch/a patch -Np1 -i ../qemu-2.11.1-glibc-2.27-mman_create.patch - ' -)" diff --git a/extra/qemu/qemu-2.11.1-glibc-2.27-mman_create.patch b/extra/qemu/qemu-2.11.1-glibc-2.27-mman_create.patch deleted file mode 100644 index 6b0f283d..00000000 --- a/extra/qemu/qemu-2.11.1-glibc-2.27-mman_create.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -rauN qemu-2.11.1/configure qemu-2.11.1-glibc-2.27-mman_create-patch/configure ---- qemu-2.11.1/configure 2018-02-14 22:53:22.000000000 +0100 -+++ qemu-2.11.1-glibc-2.27-mman_create-patch/configure 2018-05-01 08:12:01.052175589 +0200 -@@ -3920,7 +3920,7 @@ - # check if memfd is supported - memfd=no - cat > $TMPC << EOF --#include <sys/memfd.h> -+#include <sys/mman.h> - - int main(void) - { -diff -rauN qemu-2.11.1/util/memfd.c qemu-2.11.1-glibc-2.27-mman_create-patch/util/memfd.c ---- qemu-2.11.1/util/memfd.c 2018-02-14 22:53:23.000000000 +0100 -+++ qemu-2.11.1-glibc-2.27-mman_create-patch/util/memfd.c 2018-05-01 08:13:37.393396612 +0200 -@@ -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> - |