public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Use coreutils 6.4; the dietlibc patch has been merged.

Browse Source 
svn path=/nixpkgs/trunk/; revision=6835
This commit is contained in:
Eelco Dolstra 2006-10-24 22:49:08 +00:00
parent de70885cfc
commit f86c11815f
2 changed files with 5 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/tools/misc/coreutils/default.nix
View File

@ -1,11 +1,9 @@
{stdenv, fetchurl}:
stdenv.mkDerivation ({
name = "coreutils-5.97";
stdenv.mkDerivation {
name = "coreutils-6.4";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/coreutils-5.97.tar.gz;
md5 = "bdec4b75c76ac9bf51b6dd1747d3b06e";
url = http://ftp.gnu.org/pub/gnu/coreutils/coreutils-6.4.tar.bz2;
md5 = "a3806c709c7f063b80612be846a9d88c";
};
} // (if stdenv ? isDietLibC then {
patches = [./uclibc.patch];
} else {}))
}

35
pkgs/tools/misc/coreutils/uclibc.patch
View File

@ -1,35 +0,0 @@
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)