From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 19 Mar 2010 13:42:25 +0000 (+0100)
Subject: ccache: Update to 3.0pre0.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fce85abf5846d30f4dcd61a70b3e15141d24ec2c;p=ipfire-3.x.git

ccache: Update to 3.0pre0.
---

diff --git a/pkgs/core/ccache/ccache.nm b/pkgs/core/ccache/ccache.nm
index cce011bf0..63a30b812 100644
--- a/pkgs/core/ccache/ccache.nm
+++ b/pkgs/core/ccache/ccache.nm
@@ -25,7 +25,7 @@
 include $(PKGROOT)/Include
 
 PKG_NAME       = ccache
-PKG_VER        = 2.4
+PKG_VER        = 3.0pre0
 PKG_REL        = 0
 
 PKG_MAINTAINER =
@@ -34,6 +34,8 @@ PKG_URL        = http://ccache.samba.org/
 PKG_LICENSE    = GPLv2+
 PKG_SUMMARY    = C/C++ compiler cache.
 
+PKG_DEPS      += zlib
+
 define PKG_DESCRIPTION
 	ccache is a compiler cache.  It acts as a caching pre-processor to \
 	C/C++ compilers, using the -E compiler switch and a hash to detect \
@@ -45,9 +47,9 @@ PKG_TARBALL    = $(THISAPP).tar.gz
 
 CONFIGURE_OPTIONS += --mandir=/usr/share
 
-###############################################################################
-# Installation Details
-###############################################################################
+define STAGE_PREPARE_CMDS
+	cd $(DIR_APP) && sed -e "s/hash_int(&hash, st.st_mtime);//g" -i ccache.c
+endef
 
 define STAGE_INSTALL
 	cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT)
diff --git a/pkgs/core/ccache/patches/ccache-2.4.patch b/pkgs/core/ccache/patches/ccache-2.4.patch
deleted file mode 100644
index b2193c3e6..000000000
--- a/pkgs/core/ccache/patches/ccache-2.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/ccache.c	2004-04-15 13:49:38.000000000 +0100
-+++ b/ccache.c	2004-04-15 17:47:59.000000000 +0100
-@@ -322,7 +322,9 @@
- 		failed();
- 	}
- 	hash_int(st.st_size);
-+#if 0 /* don't hash on the modification time */
- 	hash_int(st.st_mtime);
-+#endif
- 
- 	/* possibly hash the current working directory */
- 	if (getenv("CCACHE_HASHDIR")) {