* Revive the old coreutils, since coreutils 6 is broken beyond repair

with dietlibc (it does some incredibly nasty hackery with the system
  header files...).

svn path=/nixpkgs/trunk/; revision=6878
This commit is contained in:
Eelco Dolstra 2006-10-27 19:53:23 +00:00
parent d29fe5bfc1
commit 0f7883d12f
2 changed files with 45 additions and 0 deletions

View file

@ -0,0 +1,10 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "coreutils-5.97";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/coreutils-5.97.tar.gz;
md5 = "bdec4b75c76ac9bf51b6dd1747d3b06e";
};
patches = [./dietlibc.patch];
}

View file

@ -0,0 +1,35 @@
diff -rc coreutils-5.97-orig/lib/strftime.c coreutils-5.97/lib/strftime.c
*** coreutils-5.97-orig/lib/strftime.c 2006-10-18 17:10:16.000000000 +0200
--- coreutils-5.97/lib/strftime.c 2006-10-18 17:19:10.000000000 +0200
***************
*** 180,185 ****
--- 180,191 ----
# define memset_zero(P, Len) (memset (P, '0', Len), (P) += (Len))
#endif
+ #if FPRINTFTIME
+ #define advance(p, _n) ;
+ #else
+ #define advance(p, _n) p += _n;
+ #endif
+
#define add(n, f) \
do \
{ \
***************
*** 198,204 ****
memset_space (p, _delta); \
} \
f; \
! p += FPRINTFTIME ? 0 : _n; \
} \
i += _incr; \
} while (0)
--- 204,210 ----
memset_space (p, _delta); \
} \
f; \
! advance(p, _n); \
} \
i += _incr; \
} while (0)