summary refs log tree commit diff
path: root/pkgs/os-specific/linux/lxc
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2017-11-09 02:21:00 +0100
committeraszlig <aszlig@nix.build>2017-11-09 02:21:00 +0100
commit2a894cd2d14e0858d4942cf3d15c188372c3a121 (patch)
treef5699d4ebfc52511272e7126548bf874a22becc1 /pkgs/os-specific/linux/lxc
parente5bda9399db0e5fdcf0982f7752419055d68e2eb (diff)
downloadnixpkgs-2a894cd2d14e0858d4942cf3d15c188372c3a121.tar
nixpkgs-2a894cd2d14e0858d4942cf3d15c188372c3a121.tar.gz
nixpkgs-2a894cd2d14e0858d4942cf3d15c188372c3a121.tar.bz2
nixpkgs-2a894cd2d14e0858d4942cf3d15c188372c3a121.tar.lz
nixpkgs-2a894cd2d14e0858d4942cf3d15c188372c3a121.tar.xz
nixpkgs-2a894cd2d14e0858d4942cf3d15c188372c3a121.tar.zst
nixpkgs-2a894cd2d14e0858d4942cf3d15c188372c3a121.zip
lxc: Fix build error with glibc 2.26
This issue doesn't necessarily have to do with glibc 2.26 and it could
have been fixed if we'd replace -Werror with -Wall.

The error in question was:

storage/overlay.c:808:13: error: 'dirlen' may be used uninitialized in
this function [-Werror=maybe-uninitialized]

After looking at the code in overlay.c it indeed might use dirlen
unitialized.

Unrelated to the glibc upgrade which brought the problem to the surface,
this also has been fixed upstream at lxc/lxc@180c477a326ce85632249ff169.

The reason however, that led to the upstream fix was a segfault which
has been reported at lxc/lxc#1802.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @wkennington, @globin, @fpletz
Diffstat (limited to 'pkgs/os-specific/linux/lxc')
-rw-r--r--pkgs/os-specific/linux/lxc/default.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index f818d2c0d8c..2660f299262 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -29,6 +29,12 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./support-db2x.patch
+    # Fix build error against glibc 2.26
+    (fetchpatch {
+      url = "https://github.com/lxc/lxc/commit/"
+          + "180c477a326ce85632249ff16990e8c29db1b6fa.patch";
+      sha256 = "05jkiiixxk9ibj1fwzmy56rkkign28bd9mrmgiz12g92r2qahm2z";
+    })
   ];
 
   postPatch = ''