From e7c47f424f14d4464abb805903a8050af2df6202 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 24 Aug 2010 22:29:58 +0000
Subject: [PATCH] The uclibc used in bootstrap-tools needs some options to
 allow bzip2 to build with it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23414
---
 pkgs/stdenv/linux/make-bootstrap-tools.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 6d23e3812f9..b89523cbc85 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -10,7 +10,15 @@ rec {
     aclSupport = false;
   });
 
-  gccLinkStatic = wrapGCCWith (import ../../build-support/gcc-wrapper) uclibc
+  # bzip2 wants utime.h, a header 'legacy' in uclibc
+  uclibcForBzip2 = uclibc.override {
+    extraConfig = ''
+        UCLIBC_SUSV3_LEGACY y
+        UCLIBC_SUSV4_LEGACY y
+    '';
+  };
+
+  gccLinkStatic = wrapGCCWith (import ../../build-support/gcc-wrapper) uclibcForBzip2
     stdenv.gcc.gcc;
   stdenvLinkStatic = overrideGCC stdenv gccLinkStatic;