diff --git a/ccache-3.1.9.tar.bz2 b/ccache-3.1.9.tar.bz2 deleted file mode 100644 index 460f1d2..0000000 --- a/ccache-3.1.9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:04d3e2e438ac8d4cc4b110b68cdd61bd59226c6588739a4a386869467f5ced7c -size 266547 diff --git a/ccache-3.2.1.tar.xz b/ccache-3.2.1.tar.xz new file mode 100644 index 0000000..d4b5cc9 --- /dev/null +++ b/ccache-3.2.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:872af34e1d2cef18694001d29db7f167d644e7602ca32cd6c74b28d81458bd9d +size 297868 diff --git a/ccache-3.2.1.tar.xz.asc b/ccache-3.2.1.tar.xz.asc new file mode 100644 index 0000000..6d471f9 --- /dev/null +++ b/ccache-3.2.1.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABCAAGBQJUiKLzAAoJEJlt2gdVlK24MCAP/0ArDT9HvfULtXza2j1yT6jR +0GmvbqzGjSDGEiT3krC7kLX/X+oajcWm7peQEvs7x0D8Li005Qhgr2bHOwxqYwVL +qWfNK0pg2D3PkL1XOj0mchRXHdZFNeHNinTFNzu9EHDQtK8ihMsZHJWZeRk6blms +2jomzSIr5B/iuRM4C6np0LUkIO/JOF8tVm5H604e7Zc56CT+9jLt6aYiqW9HCaCO +wEJ3/JmIFCVA0VW642caIWkhd7FHy24JEdjxzVz77O/2JNWAC6icNUWtZEwMcPQE +YCnujq618dilbnRP32CQNgTxCWLIfQ4gsEBOG3PY4JcJejlcra777TY3CIL9ugO2 +4PgQdEOCedIY0pZlAyH4bevK2w68u3bwi/Z9n1wWV9bT2ghLNwb5GlubX0d5xAY+ +5LvnENZb/tScd5wzIi3HvnxHhlFGEkDareyfAcGGC7+lrz0N6soYydNax+AHZLSK +qYvMSHUYX1p/Y9upQKqWCXPSerGjx3MvLbGdSff14pdOxaKDTgFSfQZPtq3D8wKz +QaD22rsrtarTcIa4hnyh8wTQ4/cpBDaD4ekT1hbcBblcDOhzo0qoeX2VBaEnpm5T +OT51uBVF+8h282Ma5bGT181dHVkTWBSEiXiDz8V8AhFPyOBVblVDpeyM8lIDjEIM +RN1DBPE497e+2c1UCrW8 +=zJhj +-----END PGP SIGNATURE----- diff --git a/ccache-gcc48.patch b/ccache-gcc48.patch deleted file mode 100644 index 77ddffe..0000000 --- a/ccache-gcc48.patch +++ /dev/null @@ -1,161 +0,0 @@ -X-Git-Url: https://gitweb.samba.org/?p=ccache.git;a=blobdiff_plain;f=test.sh;h=3e3838712aecb402b89bd070b1c46c616e44a1c6;hp=3ed90697bf6ec0eb1a69e4affbb1cfe65a8d74cb;hb=b5d63f81c1a83fd4c50b769a96a04f581b7db70c;hpb=fd7d9b8d9aaaaacfa0eafe668bff4404b8efa5e9 - -Index: ccache-3.1.9/test.sh -=================================================================== ---- ccache-3.1.9.orig/test.sh -+++ ccache-3.1.9/test.sh -@@ -3,7 +3,7 @@ - # A simple test suite for ccache. - # - # Copyright (C) 2002-2007 Andrew Tridgell --# Copyright (C) 2009-2012 Joel Rosdahl -+# Copyright (C) 2009-2013 Joel Rosdahl - # - # This program is free software; you can redistribute it and/or modify it under - # the terms of the GNU General Public License as published by the Free Software -@@ -562,6 +562,12 @@ int test3; - EOF - backdate test1.h test2.h test3.h - -+ $COMPILER -c -Wp,-MD,expected.d test.c -+ expected_d_content=`cat expected.d` -+ -+ $COMPILER -c -Wp,-MMD,expected_mmd.d test.c -+ expected_mmd_d_content=`cat expected_mmd.d` -+ - ################################################################## - # First compilation is a miss. - testname="first compilation" -@@ -677,7 +683,7 @@ EOF - checkstat 'cache hit (direct)' 0 - checkstat 'cache hit (preprocessed)' 0 - checkstat 'cache miss' 1 -- checkfile other.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile other.d "$expected_d_content" - - rm -f other.d - -@@ -685,7 +691,7 @@ EOF - checkstat 'cache hit (direct)' 1 - checkstat 'cache hit (preprocessed)' 0 - checkstat 'cache miss' 1 -- checkfile other.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile other.d "$expected_d_content" - - rm -f other.d - -@@ -698,7 +704,7 @@ EOF - checkstat 'cache hit (direct)' 0 - checkstat 'cache hit (preprocessed)' 0 - checkstat 'cache miss' 1 -- checkfile other.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile other.d "$expected_mmd_d_content" - - rm -f other.d - -@@ -706,7 +712,7 @@ EOF - checkstat 'cache hit (direct)' 1 - checkstat 'cache hit (preprocessed)' 0 - checkstat 'cache miss' 1 -- checkfile other.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile other.d "$expected_mmd_d_content" - - rm -f other.d - -@@ -760,7 +766,7 @@ EOF - checkstat 'cache hit (direct)' 0 - checkstat 'cache hit (preprocessed)' 0 - checkstat 'cache miss' 1 -- checkfile test.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile test.d "$expected_d_content" - - rm -f test.d - -@@ -768,7 +774,7 @@ EOF - checkstat 'cache hit (direct)' 1 - checkstat 'cache hit (preprocessed)' 0 - checkstat 'cache miss' 1 -- checkfile test.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile test.d "$expected_d_content" - - ################################################################## - # Check the scenario of running a ccache with direct mode on a cache -@@ -780,7 +786,7 @@ EOF - checkstat 'cache hit (direct)' 0 - checkstat 'cache hit (preprocessed)' 0 - checkstat 'cache miss' 1 -- checkfile test.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile test.d "$expected_d_content" - - rm -f test.d - -@@ -788,7 +794,7 @@ EOF - checkstat 'cache hit (direct)' 0 - checkstat 'cache hit (preprocessed)' 1 - checkstat 'cache miss' 1 -- checkfile test.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile test.d "$expected_d_content" - - rm -f test.d - -@@ -796,7 +802,7 @@ EOF - checkstat 'cache hit (direct)' 0 - checkstat 'cache hit (preprocessed)' 2 - checkstat 'cache miss' 1 -- checkfile test.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile test.d "$expected_d_content" - - rm -f test.d - -@@ -804,7 +810,7 @@ EOF - checkstat 'cache hit (direct)' 1 - checkstat 'cache hit (preprocessed)' 2 - checkstat 'cache miss' 1 -- checkfile test.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile test.d "$expected_d_content" - - ################################################################## - # Check that -MF works. -@@ -815,7 +821,7 @@ EOF - checkstat 'cache hit (direct)' 0 - checkstat 'cache hit (preprocessed)' 0 - checkstat 'cache miss' 1 -- checkfile other.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile other.d "$expected_d_content" - - rm -f other.d - -@@ -823,7 +829,7 @@ EOF - checkstat 'cache hit (direct)' 1 - checkstat 'cache hit (preprocessed)' 0 - checkstat 'cache miss' 1 -- checkfile other.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile other.d "$expected_d_content" - - ################################################################## - # Check that a missing .d file in the cache is handled correctly. -@@ -835,13 +841,13 @@ EOF - checkstat 'cache hit (direct)' 0 - checkstat 'cache hit (preprocessed)' 0 - checkstat 'cache miss' 1 -- checkfile other.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile other.d "$expected_d_content" - - $CCACHE $COMPILER -c -MD test.c - checkstat 'cache hit (direct)' 1 - checkstat 'cache hit (preprocessed)' 0 - checkstat 'cache miss' 1 -- checkfile other.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile other.d "$expected_d_content" - - find $CCACHE_DIR -name '*.d' -exec rm -f '{}' \; - -@@ -849,7 +855,7 @@ EOF - checkstat 'cache hit (direct)' 1 - checkstat 'cache hit (preprocessed)' 1 - checkstat 'cache miss' 1 -- checkfile other.d "test.o: test.c test1.h test3.h test2.h" -+ checkfile other.d "$expected_d_content" - - ################################################################## - # Check that stderr from both the preprocessor and the compiler is emitted diff --git a/ccache.changes b/ccache.changes index 1fe67b9..40d0f9e 100644 --- a/ccache.changes +++ b/ccache.changes @@ -1,3 +1,62 @@ +------------------------------------------------------------------- +Fri Feb 20 18:12:09 UTC 2015 - mpluskal@suse.com + +- Add gpg signature +- Remove ccache-gcc48.patch and xclang.patch (both are already + present in current release) +- On i586, use only small testsuite (quicktest) full testsuite + fails (https://bugzilla.samba.org/show_bug.cgi?id=11109) +- Update to 3.2.1: + * Added support for configuring ccache via one or several + configuration files instead of via environment variables. + Environment variables still have priority but are no longer + the recommended way of customizing ccache behavior. See the + manual for more information. + * Added support for compiler error/warning messages with color. + * Made creation of temporary directories and cache directories + smarter to avoid unnecessary stat calls. + * Improved efficiency of the algorithm that scans for + __DATE_ and __TIME__ tokens in the hashed source code. + * Added support for several binaries (separated by space) in + CCACHE_PREFIX. + * The -c option is no longer passed to the preprocessor. + This fixes problems with clang and Solaris’s C++ compiler. + * ccache no longer passes preprocessor options like -D and -I to + the compiler when compiling preprocessed output. This fixes + warnings emitted by clang. + * Compiler options -fprofile-generate, -fprofile-arcs, + -fprofile-use and -fbranch-probabilities are now handled + without bailing. + * Added support for clang’s --serialize-diagnostic option, + storing the diagnostic file (.dia) in the cache. + * Added support for precompiled headers when using clang. + * Changed the -x language option to use the new objective C + standard for GCC and clang. + * On a cache miss, ccache now instructs the compiler to create + the object file at the real destination and then copies the + file into the cache instead of the other way around. This is + needed to support compiler options like -fprofile-arcs + and --serialize-diagnostics. + * ccache now checks that included files' ctimes aren’t too new. + This check can be turned off by adding include_file_ctime + to the “ccache sloppinessâhe filename part of options + like -Wp,-MDfilename is no longer included in the hash + since the filename doesn’t have any bearing on the result. + * Added a “read-only directâefault cache size is now 5 GB + (was previously 1 GiB). + * Added support for @file and -@file arguments (reading options + from a file). + * Bail out on too hard compiler option -Wp,-P. + * Optimized MD4 calculation code on little-endian systems. + * Various improvements and fixes on win32. + * Improved logging to the ccache log file. + * Added --dump-manifest command-line option for debugging purposes. + * Added --with-bundled-zlib configure option. + * Upgraded bundled zlib to version 1.2.8. + * Improved dev.mk to be more platform independent. + * Made the test suite work with clang and gcc-llvm on OS X. + * Various other improvements of the test suite. + ------------------------------------------------------------------- Tue Jun 25 08:44:41 UTC 2013 - pgajdos@suse.com diff --git a/ccache.keyring b/ccache.keyring new file mode 100644 index 0000000..14a6f75 --- /dev/null +++ b/ccache.keyring @@ -0,0 +1,167 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2 + +mQINBFQExj8BEADMWT73pNZLLdGOaJH1Ex/zz6bMLwfegERL4MhrmDcoh56k+aA5 +Ql2/XyX4Ks2trN+iuJwCvDBa1amAXbsjDk0Q9G2hQqTdM6GFLzUQxIycD7a+aEh2 +kHK2dFLn48tpYuZfTroGg9rNT9v+Aa5d0ImGWp6KIYh8ZnDGqgM3d5ilySSF9pfX +Iw9cv8uELgaKAbOuPsqRKCwxMIHOZ5Al8x5RJ3WUfTHrVWnJE4xIulLseMYPFYBQ +BuWW7dOm1lEPTElcRPoxdgDjhA9eOh/OxSzVjUYXeR/k/sWVtUA53rO5Ntz+B9vD +xDQQKkpguMvHuQfeJB1mbvZLTEXvhc2nwKBUqYjIIPMg7Ue/9PgkuKVcb/hF9oxW +5APnwNzTY1/nRcvjLLMPGJ1jRxU0NDnPXxcSP6SvbGznCWVwbBr439d2g8cRTdAU +MGUzB6spXg62OxihLzqGz7U0aVxZMrvIKgYFHKg8SG4e206hEParyNo5DTwS9l9a +McVarmiH2uWLxJGmG1e8q+9Oyl9/K2D3nWjbF+w5VPaB/dvl+n/6bgus6GASzSev +iI7mdcCDcKWChjMgbQVnV+tLI3kks9abDLOUM28xEc4yL+frMTBan5ZpYvRC8ZKV +vG4BkojPVIrV979GIJd6Med6Mo9JYJzy+eOShcsOHpiChpqA2QmwZH9A3wARAQAB +tB5Kb2VsIFJvc2RhaGwgPGpvZWxAZGViaWFuLm9yZz6IRgQQEQgABgUCVATJNwAK +CRAAZPn/u4RelzwLAJ9W6/FGasA/L5tIgmHwwo7WZjMxzgCgrBrpvZau46MWBlcH +ffO/DamRyF2IRgQQEQgABgUCVAc+yQAKCRDRFdBnql/XrI1YAKCOL8Zp/B1SZLau +sKTd6APmMXSyagCfZJCKi40mfeH3ilH/uA4goJ1s6e+InAQQAQgABgUCVAc+7AAK +CRA6Wemwy8zPre+wA/0QXlpGKXpi9sujBs4vayk2aq9g0Uol9TMjaGZkP70s/CPG +KU7KXEQC0kSqLe68bWWt/DF/QZDmTMbSz5lg9mjrJQks+3jLmCzS+WlV8iDdWLpp +jz4K73SW53/kWpKmTurB29iK/o9X6al7AF4WlM7K43bJ0GlCBJMz7ICgDdjFQYkC +HAQQAQIABgUCVI9HGwAKCRB5j6VtD/v2+03oD/4gkBK2vXd6EDSON7Yfv5dG8CdZ +NMqre2wjsA+CkY2VWmf+p8x2p1l1CGZju/514QLrIRbGwcpP0LpwyG6qFjILzEQg +9e54MU0mcaTt3MP8aNgoyU9KLs2z52Ds8ug0sTjoBvRLlA/Alx17OmtUZjzbYMXP +EbZYLxn6di4flkwYulwP3r0b3FQf/iR3lKX6dw5U8P2rL90Y8nyyoSWGjSWsZMNj +8SOneyrNyHHYq8Tim16bYAnTdM/dlEKTANZ6E6glAz16GqDPbGCYj3y5I+0iWapy +8ZsQi8eeiADk5klJCC2bjRpMfE3mUBnWHFme7yyaOYTp4qAJSU/cIcQLmPef0kzT +0dPoqwvQQOZ7JmIbzBWyFWqUd8cMN0had9t4GM3mZ60cwZW59QrKqutoNmKu3lk/ +T4PQhUNVeds9ukYT0xAPYgXMkdJjjtZwUG6ZhSignqsr+3/eg1tBEkyQdnMCux6g +Y3FqqqzNA/UaMViGANqqFuYNqUAl3/1IBQmlDki9T1HdfKc3Zi0nXTOhVaUDDV3J +DNLS/xV+KDSy/fTkfYBQMvVvjPJSxHZlkBM1WYkVK17fDOmgiHE0+M6viX70tfLJ +IyxE5ZobiLTOV4CFSKt9GdCiIPX2Rhq3yA5E0X9JiqxSvEO8wrvLraRKPiEznKdO +898WtVHusGgWO3pUMYkCHAQQAQgABgUCVAc+3QAKCRDjN9uTQm5BVM1pEACvtMui +XPLGFw3jecGqgIck7Ip868XjOcfG2mwWui4u7ikegRROvqi7DZIO1aopS4yNYkMs +MF0179rWsZh25p9YVTeA/gVkl8nZKU8YqorPNvSu/5WgEsdvBbP0GtrIhJrOsx9x +jqZz16slhqAYTkE4U1WxsQ2bi90k/luVYrmCsojE3CGWgsnQhSsNzvJ7vk8adaDN +ml7am/gaqA1SJPkFhI7uS2fA6XVwlICDeRlDvCsYJjOMYPANR6pzmbUvTWU0ljTJ +JP7uR88IVyYAUtc1MuvghILte0QYswyqgbnYQpJlm6y2LMhxiHKWO2AVeUQiccRX +QMUSSdXMmstFgQJ0TYovQVWhr0y+Caub6jbVdPzVTk2oLG5Pnw0qWV4kjxfyZx8A +CVpKU7hZf93mrUjGFlvK3+RfV7+PF3lrmWOhEsBO9oZSDclov4tA/TxBvuGHQDFV +NJLTpE6fSThtDKRb/8Zzn0pe5iRoTHdgRxdNM7TC3x4nLkO2wYmsOMIB/p4F7GnS +Tom4bbqxYbnocR5bRyjB+XRGPM5bOn4bccH/pF7s5ijFPdLwmSGb4vEUumQdyoWG +pKYhdm4XJk541cucQbqUjKq3m6wSjF6Z87JC3ooFy/MGSuvLxwmZJ4yRPUKFFZD7 +Tv9FHbxsD4Y1Mm5AWpW6Yd+EXM2Vkqvs0oZX14kCHAQQAQgABgUCVAsAhAAKCRDU +8hm/7JmEiYqDD/oC3O0RdAa3y0pfoaeCJpc72PJjstmCDqqLVac/gJuMbpOxMn8t +m4bv13XNL3BwEyduLzWb7ewg5Zatk3C1anKIjpfWV/GOG6dqnUbS0vk2VP202/GI +0GZVb8mnKxAlOGpAuUAlqP3KoawLpuAqBNzwUlLLn+Su+X3qpyHLuH7Sn8BQxkjn +/mkOMVUrD91ff/PPfE8V8dHsSHPkrVldtoZgR9TJtLVd2IEFIkT/9w+fsT6kNxEm +5Hr35PqKtACc3mQDlnD68WiUtOC48PgvFfgc4BbJO7rWgShnjteW3YR7u0YpxUUY +lGylkZJuZFH7vHWvG506hoKBuXaBf+qRloj4M5960lVLlmVjB6I/C8+nF/UOMfsp +f6vOEmnB94jKRCXHZ+vXzJ3XnKLv42yMNu2hIRfiAjI3WDNjG9khXTaaL3bADpdj +rQxG0WvTKRhbK9/NN0ik7QX9MeJzjt9s6/qfyhrqQLXNYTHF69qCtgiJfBcS/BmQ +pCD1gWE5yEeO6gI8GVygAPOhxB9xsiwDEwzKKL+Dev0Btc2N1FXzQz5sLGRi5TKY +nMY+4hO2oGzWqfJQadvKN3kIkBOYLwM9Ic18RXjkGZScAubqo7NYXTC8BgN9alJD +I16YS5q8t2h7L7AK1H2fFNrYabsa2oJIuw9N1OfipTlqrTg/g44ojvelhIkCHAQQ +AQgABgUCVHNsXgAKCRAzwf49gdcv+EYcD/4mOkQqvSdJxvBF9pFP11qb9lQq8GFF +h+0hDK1iS5CvFqZSetMn8gq8GA0CxWrnCaXCdb3EeLHqXWByv9rzGROo2se4qPJ0 +zicKFcCLYi7OPBRdpIiDEGzDZFXKcd8i2x67lK3gXgDj0T9B27lpBgfAOUv/81q/ +i8mIRbuXdwpl12VGzi/N/4KcjxItgy93wcpFG0Csstgh6WA8OHvtWUg5Dj4xnNWm +LeBLgID9RiTc23OW8QGPDDG1txuLw5Tq+gcUf3FHlNliFRvQEzyVKUnsVAMOozz/ +m8VnVIjL/ylTsg2sRWXci90PZupmzeWxvUkFK91JK6YPr0jlDHpBG9e6yycjw1PG +ANM8SKQ4vfdPI+8RWDpODY/SiV4AFM+MxTmHsEWOYL7bFdmcSvnbzfgyKw462BXn +i2gUyewi+4XyFqBJ/FCUp+quHdug9mqS6glsDqLGvpEVxnraFbFDYjkfaAjHtoxv +xojzdGpbz8+jwwUJTO4nynlgco4fVV/uA2uB3kDhTswoHcPAvAC7HhL1xnRhfCx6 +D27RI8eVzKX6va5c/2Na9b589+/tS/MeEr5e2fKbmiGoXXy2jKPy2g5O7byvleo1 +VkmfLXo6sehkuIvj+9pcistpRI/B/jn/Ea34KkU0jm2xlh5tklp/LrCBK5zgZ9Ex +Pm6DImXaRQ6kaYkCNwQTAQgAIQUCVATISAIbAwULCQgHAwUVCgkICwUWAgMBAAIe +AQIXgAAKCRCZbdoHVZStuPv5D/sGVDUQxaU+WEZoMJtxK7m2E+i6pTqLYyVdbfeT +2YeBFbViwBbL/mHyyDOENavtORbPTgK3MbjErL0Is9qltpPTwkkr+jTNBPxWQanp +aN2D9aVKpyQ9ja+MjRqI+RZ6wUypIJDTac6jpmapFBy8liyLFaHaM3YzTdhRzA1t +k7xOWV70or/uNAEZPvnwW2HbM0pMsxh7ztdYBXItH2yFrPggqbw5sNGIP7RyCgLm +Pj6I7gH9y3MojIEjgERKRC2+P+T5cqS4/P2qcEsWK49w/d0sPskgs8yQQalSmcEA +13/3Z6/3DZ6nBRzMeueo0+Y4EWTCkiDe7pTXmmhdtUvUk3F6AAP464Au18c4lcW+ +pH5MN3m2UHvRSfmfUQTlkYWVQnFjBVdD9HSi1hxHvvpYtgiqpBURvD74qqMljPaB +EB/FGkwNN8IsSqO3dLruiCmxMuIdxbIRY4lJA7mZOn+1xjtrZgHS2HHb4VC0eoKI +8YeqxRN7BmuD1XMDg5GA9v4BrdZKANN2X9GrYEalSjpr6MHId19NzO+rqu9vYT7p +itNwDGUqCLqtoPc4kXDduEoITgYSjjU1Th7e3tjS489VTFKKteQyIRnCMeMeSO82 +ZHvMpDtGMWDtl/seqzTm1pIOvw0nvm/jwOTE8nIqcDohnzkrKa8s6XiJDrxzUwyv +czMQB7QfSm9lbCBSb3NkYWhsIDxqb2VsQHJvc2RhaGwubmV0PohGBBARCAAGBQJU +BMk3AAoJEABk+f+7hF6XkcMAnRSo7xl1Mzs5393QpqKNRvzHTjbMAKDIOr63nam3 +utLG5Z4z8XsVnnAoGYhGBBARCAAGBQJUBz7JAAoJENEV0GeqX9esbNAAnjT4LdrP +YOfaqP8aW3mhtxXhfFzWAKCfXVnYq4dLRYw2BmfdXGi8zWWwdoicBBABCAAGBQJU +Bz7sAAoJEDpZ6bDLzM+tSP0EAKLm8u/dhMREaCMhz85qtEuTjJR3/wlvIDJJnK3b +P3ab5HjKXjSSqSOU3QW+2gsqMJjnrs2mKRsn1Yu3SgnAwqUF59H8oShAy/P+whmY +fwwc4rggPIfO1q+wX4sjAZA3ldI2wTRx1FGTpL0HeFWl7GJqa4q+uxeAOve4vFpq +b9ERiQIcBBABAgAGBQJUj0cbAAoJEHmPpW0P+/b77ZkP/0TtEygDIZoOaHx9CVLj +hjknfLiNiRiO+PQYnxn/3xWCUp4i2TNzcK9BwxNITKG70PLWv3R54TV04HR1jWWF +C0fhw9nyixLWvNR9kulyKawC/mFBM1+j9tZWN5sXfQMzMUof03sP6jr2aJYpgjFt +QwziFhfGidj2s1/U+jqZ11zLL72V5pcfFttHQD3Tl8kCZkY7f5ycSnGUC+jAfO9S +Ks8Fyo1i/WyuHF9VKCyeFlMJb9W4nG0utL7kmqwQvCQ47uUlmqgA/YDALnaUGNe6 +yWtqnTDbGUDp4H4yj/GiuLf04nhaqH9tisdB3VaqR4iIDBLIX6ZL2Hz9RdRmvE+v +7JKoJfMJmOp0T4lRInzk1QRPMxFOodHNa9Hy5xPtDJtQiRDMIZylurkbITC8kp/6 +993xLcGYFyi9VAl/9Yr8Zz+n9sp4jia/7WNtficSyTzq7nA+/1G+2+pUVqo03S5Y +FaQDMriwMyohg+hv8StojNPnKeIsNq88+qhX41ne0qFpe3Wn3VVXx1S/k3mUQWac +AP2ukEkMc4JuarKtS3BTIgkDfODidRYUe5hWGUG86qa0Mg7gW9Ypbj/aYWQ8ieYe +3zYgiYBLiXXIxdZsQONKIArA4TdJFCoDybGMwThWW1F9T+9pnE0cigY3FV3QQgh7 +fKI0604oRjfdkLsYVL3y2KsWiQIcBBABCAAGBQJUBz7dAAoJEOM325NCbkFUhoQP +/2OgWY8UVpkr+CYGBispY4oIt7sWgMxBpEkoNN0EmSflX2Mtxf5UWw7xC1DflE5s +dMSg8GS9T4LZbkoZEbLjY9hKKloBBspDuKkstY+RrKjZBjlk94xr7OjaD+zM0Xbq +oAbeTGqToANWYVvhGHifSA8mCmiKyz47dPAq9YXPI5lDrDmyPYUzb8AhdWs4URSK +xc2GwjHIQ0VwsX3bXNuqCs5gS+GtHYdHlEpr8y3Ji/onKFazfRCSMZJ5ha1jYgaZ +/yk2SEvM+QFiituCuHHU8J9D/n4mWdkGnms7OWwx4sAKLt4aWYEi1dPXh+Xqey8c +85b/XaMjp04Fo00qln/u5iZQNT4viCnd8VZAeBYNp6o9zDh1AcZ9RvtGmkq1HjCK +4gX/Uc+5OTi32OllGHeuuyxgyo3us9pu0GZQ/FfkMUEgromO8fX5sR16eno2akEA +vXAOLRM7+7zCwxUdU8y5KLWPr+28txTr7IjnclF4PTuXFEPeDUsn6lNbCqdO/XlX +YGOn+Ha4r3LjGp6kfIlrKrfuMKGZEcVal4ar+VqJBhYFvXXMiRyZSNeDVMewFCx4 +iIMmF7rmFXghbqODFkrZNnIdm2Mg6a7IWynlrVxrNLWvFDi8NxYdm0n+7dKrIhGH +mJI1ZVnBfLYlQ0Ddu5lfjjbaU8Vjw1x4HOVzTUYrfMtsiQIcBBABCAAGBQJUCwCC +AAoJENTyGb/smYSJzaEQAKyvvtriWBLToJfR7CXMT6FnaDoKmQkJdj/ErJm8+0rk +MKN8OmGj2Euttfn3ksvNilynE+2UP1Ug5rZexOGOV8+O34NZRD0Z/JAM9L9FIrFF +6SxhP0l0UDRhZpuHeDbCl0ApIL8JDkLYZnk3vzSWOyEfKfVkKwxrOswfzzl+lnct +rg1z90neFiK35w5GWAgn8a9oXbo+aFLfP4p+KC3PmWGjGUbOd+VqWMuYFmu3p5cd +VCFTd2jPR9QZB4o7AXymAfv5cKsOJXLse+hZshhnBFQLXiT74+kSink1Ulvf08Z3 +3B1r78vA4MwZX0UN+ihNUlH2mgHvl+e/CvGfGgjK1FYW/UyGJMqHfDmMIIddzn/T +uDCm8OuwUv3oNaneDGLmzGGSOfELNVjaoD/YH6xIvFaVl+T2LCx/Fq6pb+gl26FK +cl0SSUQqMCnzLiLUT9DkNrSJB4wwuMfUfcl0S4PGX55wm6WM9Y9hBc42HvKh1Q2G +0YikzY+KiJ4DGfmsXK2UzCBAAOFhoHdt5TLlfX2AENd8TPgHNUGhU4LaHkG/AxQo +3XDLegHMgiJnQ9NPHgawgnYSN4AXaWbccj26MT7Ept2JyBb+jHem1VPn5o0N4DYw +XA+1J9ZToECL4vpoAZT4EjOSZadiCGNCCQqXjeQSM2+mX371heXFbkSsru5A0Gl8 +iQIcBBABCAAGBQJUc2xeAAoJEDPB/j2B1y/4f90P/jmws0V9Zr2/Dqlm10JBsQI4 +AeXvfLY4K07bMEg2hnJtET5YM94OS9crD+8h2XvpDSUE0kyki5/D319hstObeuHU +r9u1EamAp0/tMna6o97/0u8uoaorssuevPIhGhEZE8IwyTLY/bgUYPbt1IKzxf4G +luBZRvRGQjCKfYO/Dw/t8ZBsMIBnafDK10FFxrr6qKVZT7l6disi3GSZtmGLNtfk +C1Qd2QNbApayl17RXhgghGOZ62BQ7a1174TOPpkQGX4sGBHULK7HAQVNMmQwDuwq +I8zGAiZmlXyOStNShKr8Z6ZdgK4+62R/myHNGaYYuZpZHi+mqpplAwHC9RH5mGSf +Lub8bM7LfrUuxUTHSyJIIprToenVynXBzVnQY097U2bJzkKUPPQbFRWn9o6Gieso +ly6X2PUkRK4vzcpE+a8xVga4rbJTzABh6mxTRaX7sKDiqa3kZwIBXhWL4inFoOzB +Y2/0PyQlKMXjPpVY3KdswmuJb04af2WclQwPanwxu3eNqbJfLJ071y1+xCVJ5/KU +3ntaH1Cflg6sVhzaXn8OMj7TLxJiqQNXXtnLEab5NzBwPUtegW79YYqHS+E6tTKS +aXI2nWOEyUW+cweiHgjKOrzmWOXh5S+CDBmucWRKnG4eQl95veYyfcAWwzfYrHMq +qf/0TnLS7kDNTrotp6IiiQI6BBMBCAAkAhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4B +AheABQJUBMiIAhkBAAoJEJlt2gdVlK24qREP/3aI/omH5UqiiWgylAkvZYycyDpk +Vz2GehiJmebulOJuzgKx1ZXcdZ1aZdC65V7EvRg3p7tubAdS7n6leGgTUTFOXBUZ +xVxPeM7mttNVjmqpK7n9wscgydPepZWCg/AoThalnjfC3y8I1fY7OiVRsEFvp6hp +XDlWdQWEKm2Fflo2X0H7DONyk160wdjDIBYec+DZpp6aVZiimGPcf++Q+5C3kJdl +j1dLXSdW+PomnJHQtuZ/oT4+mt1GFX2KLaJWAjbZIfQ6saU44DDq85BLCswizTY2 +fB4mQHFTSh/4AFgEKSixZ+lPY6v765CVrgmln3TCki02e3jnzzRQcdnLVNL7tnJk +z0l0bDUPwmkOqFUiQG/8CmAfqkBwE+uVd9PSfyqniGcjRvr2/B6jeeOtEynpvaVk +xbtu22xvLPmiUfQAji8trGcauYsWYnuEGRA9WAZYiEGaWVh/L2PKcA7VOcCfwVdp +hsnd5u8zkJAXSd9w7315VJNuIH6CNDkqYMPKnAlb0r+2EL8EbRoTz/xIsDw1lzIk +yRImRDYwiawimsZC729DbIjE81nxZcl08c5PyGHgV7WC4Uj/K3oZuuz3sHQ1lyzU +WgLXBeILKlOzqa3Okj05e3OnHrGXLgM/dCUFvC8fVEYUI560M+0oXUjes4DWhBGP +Kl2rAoYyialPPIaBuQINBFQExj8BEACfjmrWa2bBYz4IrG2Zb8agvOlSIO3XtnkU +WsOKzhUbb2YEFVU8bbLqt2/N6lXFcJSvzOwrpl3+8sPyNfAxVYKOVJYbDzLuiC+2 +brWjPp7XYgSbhJJIkirLsynPpMq48gzKS+MQDecNGoAh80HIRhV5wC2bG8DDibqX +K7DE/SNqi7IlADSR8DbeL0t8RgujA1mjZEnL/urtz7QeqntqW4AhNRSaIw1Xe19j +27GKBar6OU6KDtHvPISARtnT3PwvkdI45UqwdGFsa0YjI8n4MvN8HjrXTuCION9b +8QpB1cE5c0iJ6nUi/ezrqWOmj6+vrv1v2e72Q0X03wSlDx3VLHortp/ZNBwhBc/B +zKMkwx8/PH/jOlKSjfjglWf6N8DSmMqlfo1rQIYHxosP6h+72eUP4YNKSUAI7GRp +Yq4NROzOhT/V4W+xWgwIU4di4gHGvahOG4y3QKS7CmnDL2jCsxzhsg+F787SvpFr +mNHWu2RmZ9jDKhA+hEp0kGQhuyvJrfQGMytF8APWpifpL+SkFke+vM+EpGLxUi1M +/pQXiLlF6nJk1GBY8KUB4BDgJ74sNedAAwkyeDlogCE1gBxjuN4RW2ICs005ZTVB +bz0viZ2SybDuojbN60wZH77WK/R9GkDFzWz5tao3+//09/B80niuC7B53l5mvvua +exR+AK+IjQARAQABiQIfBBgBCAAJBQJUBMY/AhsMAAoJEJlt2gdVlK242qQP/3Ei +dDHtz4vHDh+cSh0t9tPCwng1eXn0vUfzlsX2mkELPT6b1aJN3abSNoSl4FiM/htj +jvXbqEKZhAbA3F1JEjccSdO69CXUB2puE1IzsxzwlQGe7jWewm1FkckPoe6s0f7P +UWD4t+ArKQtCajvi1DUkwIqh3kTqKNfrqw7o8a2T2429asJe/7Ud/Jo6eO/Wckab +xLg+qs/7G0Dsv44LOI5b1Cn2M4IG0PsWZz4CLyaoGqf4NMF2N7aarHdlpVWNfhLx +sYOhGebI8IXZiLXXkPFB2y7xFVsF6Rrz+0d+XbHWKTP9doGFD5gQFwvPj4pGB7mS +T0xRUijJDf1amb4bOflYDZ3ciiuRUFyD9BcZCQILl+K379Z1YLi8HpswFK8cj65E +PDum45S3/qLYCuSM1TAR9ewfX5Zjya5v4GERioBDtx4mt1rOfEETSjbUohkMVMiK +3TV8Ox5URjVslyZvnFVVxDo3S7RdL1+8cUn8s2GIYgyvy6pOIQJeptcbKkihBwAs +f5CbPOicK/lQnUiLVPCSd6uLfM0YAMw3ageU5WwnQrjLMLb6jqBsKl0mCBZHSMmY +fnaoH27/r7ypQuIf2hgLcqYur61i/iRKJaYuKzVcY04V5K0fJvlo2Ag7Y45/QxDQ +Z7QDfCcFVxwlRZDlAF76gOA10hBnLcJLrfEjjyck +=/ou8 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/ccache.spec b/ccache.spec index 5a6fd2c..69ed7b0 100644 --- a/ccache.spec +++ b/ccache.spec @@ -1,7 +1,7 @@ # # spec file for package ccache # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,16 @@ Name: ccache -Version: 3.1.9 +Version: 3.2.1 Release: 0 Summary: A Fast C/C++ Compiler Cache License: GPL-3.0+ Group: Development/Languages/C and C++ Url: http://ccache.samba.org/ -Source0: http://samba.org/ftp/ccache/%{name}-%{version}.tar.bz2 -Patch1: xclang.patch -Patch2: ccache-gcc48.patch +Source0: http://samba.org/ftp/%{name}/%{name}-%{version}.tar.xz +Source1: http://samba.org/ftp/%{name}/%{name}-%{version}.tar.xz.asc +Source2: %{name}.keyring +BuildRequires: xz BuildRequires: zlib-devel Provides: distcc:/usr/bin/ccache BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -37,23 +38,27 @@ again. Supported languages are C, C++, Objective-C and Objective-C++. %prep %setup -q -%patch1 -p1 -%patch2 -p1 %build %configure make %{?_smp_mflags} %install -make install DESTDIR=%{buildroot} +make install DESTDIR=%{buildroot} %{?_smp_mflags} %check -make check +%ifarch i586 +# On i586 use only quick minimal testsuite, full one fails +# (https://bugzilla.samba.org/show_bug.cgi?id=11109) +make quicktest %{?_smp_mflags} +%else +make check %{?_smp_mflags} +%endif %files %defattr(-,root,root,-) %doc AUTHORS.* GPL-3.0.txt LICENSE.* MANUAL.* NEWS.* README.* -%doc %{_mandir}/man1/ccache.1%{ext_man} -%{_bindir}/ccache +%doc %{_mandir}/man1/%{name}.1%{ext_man} +%{_bindir}/%{name} %changelog diff --git a/xclang.patch b/xclang.patch deleted file mode 100644 index f907849..0000000 --- a/xclang.patch +++ /dev/null @@ -1,45 +0,0 @@ -commit 8e005b067d8c2423e24ee14ffdee8343f650f1e8 -Author: Bernhard Bauer -Date: Tue Aug 16 10:23:55 2011 +0200 - - Support -Xclang compiler option. - -diff --git a/compopt.c b/compopt.c -index 35d51ad..77b57f5 100644 ---- a/compopt.c -+++ b/compopt.c -@@ -49,6 +49,7 @@ static const struct compopt compopts[] = { - {"-U", AFFECTS_CPP | TAKES_ARG | TAKES_CONCAT_ARG}, - {"-V", TAKES_ARG}, - {"-Xassembler", TAKES_ARG}, -+ {"-Xclang", TAKES_ARG}, - {"-Xlinker", TAKES_ARG}, - {"-Xpreprocessor", TOO_HARD_DIRECT | TAKES_ARG}, - {"-aux-info", TAKES_ARG}, -commit 06be1c4cc33bf2def9c6e64483b397128f57dbe3 -Author: Lubos Lunak -Date: Thu Jul 26 14:45:16 2012 +0200 - - hash also Clang plugins - -diff --git a/ccache.c b/ccache.c -index 50b4260..738c022 100644 ---- a/ccache.c -+++ b/ccache.c -@@ -972,6 +972,16 @@ calculate_object_hash(struct args *args, struct mdfour *hash, int direct_mode) - continue; - } - -+ if (str_eq(args->argv[i], "-Xclang") -+ && i + 3 < args->argc -+ && str_eq(args->argv[i+1], "-load") -+ && str_eq(args->argv[i+2], "-Xclang") -+ && stat(args->argv[i+3], &st) == 0) { -+ hash_delimiter(hash, "plugin"); -+ hash_compiler(hash, &st, args->argv[i+3], false); -+ continue; -+ } -+ - /* All other arguments are included in the hash. */ - hash_delimiter(hash, "arg"); - hash_string(hash, args->argv[i]);