Revert "lxc: fix build for glibc-2.25"

This reverts commit 76ae7e19a9.
This commit is contained in:
Franz Pletz 2017-02-24 21:45:29 +01:00
parent 1c555e772e
commit 7eb7126f5a
No known key found for this signature in database
GPG key ID: 846FDED7792617B4
2 changed files with 0 additions and 37 deletions

View file

@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
patches = [
./support-db2x.patch
./fix-glibc-2.25.patch
];
XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml";

View file

@ -1,36 +0,0 @@
diff --git a/src/lxc/bdev/lxclvm.c b/src/lxc/bdev/lxclvm.c
index 75de17f..d6d98e4 100644
--- a/src/lxc/bdev/lxclvm.c
+++ b/src/lxc/bdev/lxclvm.c
@@ -30,6 +30,7 @@
#include <string.h>
#include <unistd.h>
#include <sys/wait.h>
+#include <sys/sysmacros.h>
#include "bdev.h"
#include "config.h"
diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index a93124b..948d716 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -48,6 +48,7 @@
#include <sys/stat.h>
#include <sys/socket.h>
#include <sys/syscall.h>
+#include <sys/sysmacros.h>
#include <sys/types.h>
#include <sys/utsname.h>
#include <sys/wait.h>
diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 0dbbf2c..7135222 100644
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -34,6 +34,7 @@
#include <sys/mman.h>
#include <sys/mount.h>
#include <sys/syscall.h>
+#include <sys/sysmacros.h>
#include <sys/types.h>
#include <sys/wait.h>