diff options
| -rw-r--r-- | dev-util/ccache/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/ccache/Manifest | 33 | ||||
| -rw-r--r-- | dev-util/ccache/ccache-3.1.9.ebuild | 5 | ||||
| -rw-r--r-- | dev-util/ccache/files/ccache-3.1.9-test-gcc-3.8.patch | 174 |
4 files changed, 199 insertions, 19 deletions
diff --git a/dev-util/ccache/ChangeLog b/dev-util/ccache/ChangeLog index db89a1a0c418..3e075e14eb55 100644 --- a/dev-util/ccache/ChangeLog +++ b/dev-util/ccache/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/ccache # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ChangeLog,v 1.120 2013/03/01 12:47:52 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ChangeLog,v 1.121 2013/03/23 09:10:24 vapier Exp $ + + 23 Mar 2013; Mike Frysinger <vapier@gentoo.org> + +files/ccache-3.1.9-test-gcc-3.8.patch, ccache-3.1.9.ebuild: + Add fix from upstream for tests w/gcc-3.8 #461966 by Ryan Hill. 01 Mar 2013; Agostino Sarubbo <ago@gentoo.org> ccache-3.1.9.ebuild: Stable for sh, wrt bug #457342 diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest index f9c42a7858fd..c3377434ac89 100644 --- a/dev-util/ccache/Manifest +++ b/dev-util/ccache/Manifest @@ -1,11 +1,12 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 AUX ccache-2.4-profile.patch 1069 SHA256 7cd6e8fcd2fc90aac484ff83c1181c82eca4ec3e2d568c10025f67ac751a6794 SHA512 0bf467d058ea0aacb19a8c768109582e5ed7178926548304eee0c5e86cc74bcfe3aff64b1ee1d22701e2a3ffb7ffa4e13b7ddf25eb640fbdcf1cdf4844047c16 WHIRLPOOL c2e8756288cac5a57f5b04e2502474ba9a86552d18281e57830fa679130bc5050b69bbe5d48cdc647a1164955314731a51c2ad0ef546307e5415f62614e46ead AUX ccache-2.4-respectflags.patch 403 SHA256 f7006cc34ecc8315b023d4533273d47a7a34958e7037242811a58ee8570efbd5 SHA512 f05ebbfc30a71d0f9e2182364a9c0fed2ffe4cd382f2ff19bb2d6311d2ec086452804253aea485aea36a70871b35cf6b88e1e55260cdb898aaa8755644ba7f8a WHIRLPOOL 809a6841dd4ca9ab35fddd5258dc5781d1ebf11d7e412b7aa7611135b5aeb8fe01bd5bb2c4f1f26fef076d4c1edb34bed53870c193dd75d0d69e4c14d1fef581 AUX ccache-2.4-utimes.patch 3267 SHA256 72f617b329a68c9db57180a9940689a48acee771067392a2d68b8abf8cdf891a SHA512 06592fa636085e39fb3b8a3495fc388a68603afcc3d2273b4379caa1d0ab2346082459916bf047aa1f6fef73cc23ecbcd74e7335e2ca9fd154a7e726713fae44 WHIRLPOOL 8db5e5187aa775f8fb569346e64d663e245d8be1403e0d807cd4b34a0a4af0db3f32db60712ef49a461ef82e315ed7baf5c5dd86c0c3f37553e4d43d8af3a7d3 AUX ccache-2.4-xrealloc.patch 742 SHA256 119c8fb7f3ec725444e416e42d690fdf81470213a837274bc5375f659942147c SHA512 86a06cdeb9e9b7ed6bcbf57f85cfa38fe13f64d4654e225cc1b24b0dea38778fc87732362be872587ad3db02e5421a7bcb4771f56cf79ecea0b77ed4928cddfc WHIRLPOOL ded4aa06e4daf6447314e00e3ac4503b143a41385f1532672c43dea9b2033b7ca17ef4111e95efd2be87c84e176bdb9310b485f45312a2c83cee557766f31195 AUX ccache-3.1.7-no-perl.patch 400 SHA256 5784419b79e89bda1bf0a8d053c26c9d798dc88ef0756f19c0b0d40f93c3aef8 SHA512 bd529e4ec577a458e5933d2f55ab54fc783eb00a14f4f6879e1cf4f20d058816651b80bed7141e1fac6863f1ed34cfc65658d42ad728b2dcb9cf4ceab7f6318a WHIRLPOOL 8299d984e66d3328166bf4a4e676f963bbd7203bacde6ac5b1d74a98da589239efa03946431b43f026e45eaf5b922e7792a89fc905c17a591304c86c1af9ddbc +AUX ccache-3.1.9-test-gcc-3.8.patch 5693 SHA256 fd7fa67150c83288bfa024051c9af2329add788ee69682da1a7579cbdf6906bc SHA512 f768b2ed0688ef25fa8956d4a69d192cc1049dea94c74b95cea26a1f905d14a11583f27995a04dd0c6d352bf5ce873bc4778235ba255d2652b5655e917ba20c6 WHIRLPOOL 3df491971a1045ade0c555d7ba1ac6bed3939419aa2d0d3b2e5889be1e2426387e451e8af73b0eacfc6ff39e7ebc4bb06ade820da07cb9ac0ad444a10bdcd10e AUX ccache-config 2094 SHA256 c330108e2b5d364a4b5f63518d38af4a0e2d47fb7626ae85f8341ca222f04995 SHA512 c30bdf6d337822e459df2d1f5fbd76654b7c450ab29898326185dd5bae14a6d800457134a135592b5ecae640efd688bdc2c985505673ccd4212ecb05e39ee912 WHIRLPOOL 9947203339da5bd422d5c2b29cd0e9492c2f4ccc1afe48e491a21dbfc8d655e4692da93904b4c745d3e6a3ac2be6e38a6a60ced5d8d697384323b8e6209bd211 DIST ccache-2.4.tar.gz 86363 SHA256 435f862ca5168c346f5aa9e242174bbf19a5abcaeecfceeac2f194558827aaa0 SHA512 6ab05f74eba5c0a7472a3d53cfa6c24e45f421f2c773776f713a46121eda21213deb34fcef214d4f8d2e756cd375637e4639a9bdfeb6b9a44455c5bcca246b19 WHIRLPOOL eb308222713d17f52f88ac97a5c63add454b350d60259d1d2238e3b54f1e80ad8c8700e0e045b40aa5be64b1db54846a86da600436778a64d2270efff7763380 DIST ccache-3.1.1.tar.gz 324042 SHA256 eb0b37e25ecfdf1262e0da7fc5f01d986923589803c230dcb7213ecbead3aed1 SHA512 de1d3b6d32df08db28a6ef99ec6ce7c5d5957d7c54a0cfc6df303979eedcc198c09ca7bdd0dd1546350f83cbd87a08fa734d6f6a04272926741ef2efbf2a596f WHIRLPOOL acf700b1ede0cbf312dcfd825191aa5a16dd8a1e18669eac6a9cdc4805d92e024bf5811c5fe77dc51a9311cff2a52c72dd16ea0b81656aa554e027abda5b00c9 @@ -29,23 +30,23 @@ EBUILD ccache-3.1.5.ebuild 1841 SHA256 831bcc798698934d8d1dee38e8a9170721a85861f EBUILD ccache-3.1.6.ebuild 1829 SHA256 289838680ac3fd1b477882273318ac78101ea8806724053f543f4ebe6f965a4d SHA512 ea5d8f403244b792f4c1d190720484df201453b1cad616c51dd73ff1df77b0a174f69873bb74a2ba83d42a6f5daf9955949b1d5936dd8ba663224195126624ec WHIRLPOOL 4ef2c1adb806b4edf3d3d2d6ea792481afc773d527774c2c222cee4c36a998d259f6a7aa0e8817f0b15dc70fabf594f5c25626415590fa11469f40c2680740af EBUILD ccache-3.1.7.ebuild 1868 SHA256 91c6bac92477d375382baea491d86ceb4c9e722c581f60e618377dcb7d8ddcc4 SHA512 be1f3207f3ebb13e19a9a03ea5a065ec811ddc466b9a00f5048a6f4f58df727ffa2af33519275ee075ac5f76681314ae89f896b853ce54cb5944cc1d6642920a WHIRLPOOL 4aa5e587c8a526774805204c09d9a37298f1561bdab262c33b0f50082de4ecb306602baf43c90f49b6a74133a1ef8c5454bf9cdc47161d3a74a4035580453f35 EBUILD ccache-3.1.8.ebuild 1828 SHA256 c8cb4b4b93ad0e34cbcd2cb53da63f2c0856c5ed729d8bc7b5385a518f2fa0c9 SHA512 c258db009169e10408d5e12b6f6e111666df1d3f6a8024d3f519529a43bd0c67a915bcf36ed6951e7953c049f2009c2165a1f2f029a94d757cddff237d35531d WHIRLPOOL 8041198c0861f7f430bbd0f7837201d6aa56cf3dd4effef75be70c5f72c3e665a68c40b70c41a93df6862a7b42d208a4bf3206c0132a820edc4cee6fbb81983b -EBUILD ccache-3.1.9.ebuild 1824 SHA256 0a9ca8153315c14a639ab433a766a1bb8603f340d2bd3635c96b0d73b7e87964 SHA512 4a47b31ff70cd87c438f5bcd214162e8d5bf46d4a33eb16c4a317627611afdcc283162db2fc6b78275543bdf143495107e7727b85318f50194e159f069224220 WHIRLPOOL fae3204d9fae93c322854afe6795f818304a7f3379aabc5a9ce7901aa56c49cfe43e53c683e2a946b1150cec28a87ac8966989626a38449a89e88d50e16c2f85 -MISC ChangeLog 15096 SHA256 3f491e935c4dc8085ef8e5f0011e0ed5605ee382031f94c19849b358282cf40e SHA512 209765119f333730837c1f2dfebfa0edf278a365ff7432ff39d014fa69cfd1fb7f44cadda14b8c78a9a195d81c9cf84a1632e6a841a2e7eb0d3b79db1d59ab39 WHIRLPOOL b49dc28ca2fcfe441689cb007e101f3a648a774e88c1d5ed75f3e614d6d5e08f7c6b3765298b2fa01eb35fd9aacfe7ed79b14a026bbdaaf80cc5a03dafd09169 +EBUILD ccache-3.1.9.ebuild 1880 SHA256 9d667779790ca79d778e873f9fcf40d8850cea6285fad8e7cf883b746485fbe4 SHA512 f2f08adbb3cedbc15c8c71fc8b8ec3574fff1d1f0014a5da23635d58da84b7b6ca4da8f7d869a699ee6e45073dfe694d2fb5ac60a126f1935c0775c9f1d6f4ba WHIRLPOOL aa20fbd4ffc096c88b40c5006d7f357ba3331736af398bf71a8dd2419faec68a7b10c978bad511f2d93db0a5441ac5a0e5bb202863954c42e1a488f06d283e1f +MISC ChangeLog 15279 SHA256 22f2a6a6fc7fda17ed8dcf608c0ee94568238f60ca396ae3eec92a8888bc8163 SHA512 4ac2543046b48f0d2fd20e5c332c2d60ad9c894eda15dcb49f7041ade089ea7765eaada41d446415270de9d0e81803fff9a2da4fff6fa7a5510c044762ef22c5 WHIRLPOOL b76842783e345ed9dc0f498ecfdb4d22f1abc2a95d9bbc73b7e34180dfea521249820ba247651e470e176a6a9b73647497cbce8992a31a163c62d91f485bfcaa MISC metadata.xml 412 SHA256 c54d1b5f225e3a82754a2550d3875b7211249572a9372abdeff5fccda469aada SHA512 63219b00d64d67e2ff11ac39f667be3ad110df35259d79267985e05ba6f0c932fd5b11dd78deb3fd062c963b6cd218db0a05958b54d323b86950991b80939899 WHIRLPOOL 329af87aff780d16300e5832dec6bec923b1cf54bd14f52db08e3fea7ef506ad85f627dc8005ec2f88f62f6dee27d7600eb558d4f66bc08011d23dee61bac297 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCgAGBQJRMKLvAAoJELp701BxlEWfTw4P+QGieHkmEEOs9hwWb+5Lc5XF -MJ05PZ3Yl5axJ+XPE057QIODN+hZm4pbiHAE/2XD3MxSG04i/0m5LwwhyBDISjxi -hL+Z3059YXhim2UQ0u11jf6nxAocuW60jtZZNdqP1XY47WFICpvxu/gE524QAp+H -Iwfdkhu6ZebxavlSPNfpOttg96E66FQYJrkXiCimoav8qa1CP1DdwE80YyMmn3B1 -MEui7ZX2G06bWrTuIACf01zeMoUvUaYeLEZKCoXRAD03lejva3fOVapagNvPsGH6 -EF9qVu5fL5m+T46pRUPP50bkVcIow9cH3mBTjUhBdhdxyagI6RqCv/ZFf8PxdVvn -L5O9QvgcNtGv6BG3ak3fKsn5gv/n6xw4x1afoiR3yxGWRrO/pZfr2bH4HFVf/uFB -mBi8p9xURsmVFuswXVr3R012yIMvmFqaPqwoH6w96ztIIiZHIYHORjAZQe7Ksiwh -9hkp6YBXIRShX1rvHN0LHew+YLi4V9QBKBvFbu75mGN/4/ZB1/FaWP4Sl8LRbMVG -3lBVXjXL6HebwCzoGueHAHJ4fGimHZJNfdb5kk3Wr8TWmf/Wa4h22l0urmY6gw6X -9a3QcaWDyNz9uTmnLuNz4LQ1JN14WEDCpy6e2e9u2AldlQKQ1bkrxQyv52zFxPjh -zfYOkl1Oc43cJdOknKtD -=ng+I +iQIcBAEBCAAGBQJRTXJ2AAoJELEHsLL7fEFW/ksQALQIeCXCA8WjDgbbQRY3zG05 +ycu3VxpV5djGJIO1XQoc1CwrorrC5hKDXRBA6EBJpI2TJeh+VhrJdo9FnpZQ9i0/ +PdnRHP3T3oBNf7UY707b1becOieFlGAdmn3Dxt5ZW7jqlI52ErKrqvCTUYg2V9qV +YXXLLvtgRwqvDqI+A9rw56f2K1CxSVXKtASl84NPBRd5x7qXaL3MxT+dghj4lmUX ++EGeQf+XUBGDvNybblcNhwBOECLgXqXxFWzIem6PDlh+c5qlh7IIs/ERAyTq0RbE +18fxBMqxT9ffvfDpJ6v+cDzuNNRCrlKqoD8wuWg+KO/IcDb6UAxrs6lqcvnkDBom +e/LxIrXXzVNnJz6Jk3C3efMdkgTARiuYvXjmtJk0WiPPk+MkFTz4r8RKxr+9y3yb +Wl9EzwthzVx2DI3AbfWgX7+TemBhI9CIysCCSJdEiJ5/kRtMvuKzt/THHv9i/J/G +j+cLgV4eXpw3VleFAAOZyU5oxOisz7ywIxIDv1KbyNq7pgRBBIUAt6nlIhkfQG/+ +t52cTUJU2QRh0i2aF0lovYe2V88tfGMzBLA6nEra0LMf6MIMipnk1bLXNeS/mTwN +rTfhXmVPbGlOXusrJIv1OzOtQbq+4hjy+o1h5/tsXfauSk8tI3vJZiPaK5t126zK +zAL7HYW5+Z6mDslYwk8/ +=gVXd -----END PGP SIGNATURE----- diff --git a/dev-util/ccache/ccache-3.1.9.ebuild b/dev-util/ccache/ccache-3.1.9.ebuild index 26acf475e3c4..214d75112941 100644 --- a/dev-util/ccache/ccache-3.1.9.ebuild +++ b/dev-util/ccache/ccache-3.1.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ccache-3.1.9.ebuild,v 1.12 2013/03/01 12:47:52 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ccache-3.1.9.ebuild,v 1.13 2013/03/23 09:10:24 vapier Exp $ EAPI="4" @@ -12,7 +12,7 @@ SRC_URI="http://samba.org/ftp/ccache/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" IUSE="" RDEPEND="sys-libs/zlib" @@ -23,6 +23,7 @@ src_prepare() { # make sure we always use system zlib rm -rf zlib epatch "${FILESDIR}"/${PN}-3.1.7-no-perl.patch #421609 + epatch "${FILESDIR}"/${P}-test-gcc-3.8.patch #461966 sed \ -e "/^LIBDIR=/s:lib:$(get_libdir):" \ "${FILESDIR}"/ccache-config > ccache-config || die diff --git a/dev-util/ccache/files/ccache-3.1.9-test-gcc-3.8.patch b/dev-util/ccache/files/ccache-3.1.9-test-gcc-3.8.patch new file mode 100644 index 000000000000..4fb654c957f9 --- /dev/null +++ b/dev-util/ccache/files/ccache-3.1.9-test-gcc-3.8.patch @@ -0,0 +1,174 @@ +https://bugs.gentoo.org/461966 + +fix from upstream + +From b5d63f81c1a83fd4c50b769a96a04f581b7db70c Mon Sep 17 00:00:00 2001 +From: Joel Rosdahl <joel@rosdahl.net> +Date: Wed, 20 Mar 2013 22:18:16 +0100 +Subject: [PATCH] Fix test suite failure on GCC 4.8 + +GCC 4.8 includes /usr/include/stdc-predef.h implicitly, and this shows up +in generated .d files. +--- + test.sh | 35 +++++++++++++++++++---------------- + 1 file changed, 19 insertions(+), 16 deletions(-) + +diff --git a/test.sh b/test.sh +index 3ed9069..3e38387 100755 +--- a/test.sh ++++ b/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,9 @@ int test3; + EOF + backdate test1.h test2.h test3.h + ++ $COMPILER -c -Wp,-MD,expected.d test.c ++ expected_d_content=`cat expected.d` ++ + ################################################################## + # First compilation is a miss. + testname="first compilation" +@@ -677,7 +680,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 +688,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 +701,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 + +@@ -706,7 +709,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 + +@@ -760,7 +763,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 +771,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 +783,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 +791,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 +799,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 +807,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 +818,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 +826,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 +838,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 +852,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 +-- +1.8.1.2 + |