3
0
Fork 0
forked from mirrors/nixpkgs

ccache: update 3.2.2 -> 3.2.3

This commit is contained in:
Tobias Geerinckx-Rice 2015-08-25 05:03:05 +02:00
parent c98685c737
commit e8a55a43cf
2 changed files with 8 additions and 42 deletions

View file

@ -1,10 +1,9 @@
{ stdenv, fetchurl, runCommand, gcc, zlib }:
let
# TODO: find out if there's harm in just using 'rec' instead.
name = "ccache-${version}";
version = "3.2.2";
sha256 = "1jm0qb3h5sypllaiyj81zp6m009vm50hzjnx994ril94kxlrj3ag";
version = "3.2.3";
sha256 = "03k0fvblwqb80zwdgas8a5fjrwvghgsn587wp3lfr0jr8gy1817c";
ccache =
stdenv.mkDerivation {
@ -14,16 +13,19 @@ stdenv.mkDerivation {
url = "mirror://samba/ccache/${name}.tar.xz";
};
patches = [ ./test-drop-perl-requirement.patch ];
buildInputs = [ zlib ];
postPatch = ''
substituteInPlace Makefile.in --replace 'objs) $(extra_libs)' 'objs)'
'';
doCheck = true;
passthru = {
# A derivation that provides gcc and g++ commands, but that
# will end up calling ccache for the given cacheDir
links = extraConfig : (runCommand "ccache-links" { passthru.gcc = gcc; passthru.isGNU = true; }
links = extraConfig: (runCommand "ccache-links"
{ passthru.gcc = gcc; passthru.isGNU = true; }
''
mkdir -p $out/bin
if [ -x "${gcc.cc}/bin/gcc" ]; then

View file

@ -1,36 +0,0 @@
Since perl is used in just one place and can easily be replaced by a
little bit of shell, do so. This makes testing on limited systems
easier.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
INSTALL.txt | 1 -
test.sh | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/INSTALL.txt b/INSTALL.txt
index 256beab..f77cbe6 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -67,7 +67,6 @@ In addition to the prerequisites mentioned above, you also need:
To debug and run the performance test suite you'll also need:
-- Perl (http://www.perl.org/)
- Python (http://www.python.org/)
Run "./autogen.sh" and then follow the steps mentioned under "Installation"
diff --git a/test.sh b/test.sh
index f14e287..1090649 100755
--- a/test.sh
+++ b/test.sh
@@ -1834,7 +1834,7 @@ prepare_cleanup_test() {
mkdir -p $dir
i=0
while [ $i -lt 10 ]; do
- perl -e 'print "A" x 4017' >$dir/result$i-4017.o
+ printf '%4017s' '' | tr ' ' 'A' >$dir/result$i-4017.o
touch $dir/result$i-4017.stderr
touch $dir/result$i-4017.d
if [ $i -gt 5 ]; then
--