From c0ee820ca52194dff85b2ad929f806ca40622bc9 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Wed, 19 Nov 2014 19:10:22 +0100 Subject: [PATCH] - updated to 3.2 - removed outdated nohash_size_mtime patch (compiler upgrade check method is configurable now) --- ccache-nohash_size_mtime.patch | 15 --------------- ccache.spec | 6 ++---- 2 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 ccache-nohash_size_mtime.patch diff --git a/ccache-nohash_size_mtime.patch b/ccache-nohash_size_mtime.patch deleted file mode 100644 index b28550a..0000000 --- a/ccache-nohash_size_mtime.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- ccache-3.1/ccache.c~ 2010-09-16 19:01:09.000000000 +0200 -+++ ccache-3.1/ccache.c 2010-10-02 18:16:57.670019849 +0200 -@@ -814,8 +814,10 @@ - /* Do nothing. */ - } else if (str_eq(compilercheck, "mtime")) { - hash_delimiter(hash, "cc_mtime"); -- hash_int(hash, st->st_size); -- hash_int(hash, st->st_mtime); -+ if (!getenv("CCACHE_NOHASH_SIZE_MTIME")) { -+ hash_int(hash, st->st_size); -+ hash_int(hash, st->st_mtime); -+ } - } else if (str_eq(compilercheck, "content") || !allow_command) { - hash_delimiter(hash, "cc_content"); - hash_file(hash, path); diff --git a/ccache.spec b/ccache.spec index a2a0f87..a794f4b 100644 --- a/ccache.spec +++ b/ccache.spec @@ -2,13 +2,12 @@ Summary: Compiler cache Summary(pl.UTF-8): Pamięć podręczna dla kompilatora Summary(pt_BR.UTF-8): Cache para compiladores C/C++ Name: ccache -Version: 3.1.10 +Version: 3.2 Release: 1 License: GPL v3 Group: Development/Tools Source0: http://www.samba.org/ftp/ccache/%{name}-%{version}.tar.xz -# Source0-md5: 20cd43818f84e3208fb4859e9679060e -Patch0: %{name}-nohash_size_mtime.patch +# Source0-md5: 7922ad7b8b44377df78896de8f7b39d1 URL: http://ccache.samba.org/ BuildRequires: automake BuildRequires: tar >= 1:1.22 @@ -54,7 +53,6 @@ kompilatora. %prep %setup -q -%patch0 -p1 # Make sure system zlib is used %{__rm} -r zlib -- 2.44.0