diff options
author | Ryan Hill <dirtyepic@gentoo.org> | 2013-04-24 05:44:24 +0000 |
---|---|---|
committer | Ryan Hill <dirtyepic@gentoo.org> | 2013-04-24 05:44:24 +0000 |
commit | eaec4fbb26915c30ef1b72f52d6e295e9eba97f1 (patch) | |
tree | 278777f2eeb626f15a7d0eb17d36ef16f737f579 /dev-util/ccache | |
parent | Version bump. (diff) | |
download | gentoo-2-eaec4fbb26915c30ef1b72f52d6e295e9eba97f1.tar.gz gentoo-2-eaec4fbb26915c30ef1b72f52d6e295e9eba97f1.tar.bz2 gentoo-2-eaec4fbb26915c30ef1b72f52d6e295e9eba97f1.zip |
Fix -Wp,MMD test failure with gcc-4.8 and correct patch name.
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 957A8463)
Diffstat (limited to 'dev-util/ccache')
-rw-r--r-- | dev-util/ccache/ChangeLog | 7 | ||||
-rw-r--r-- | dev-util/ccache/ccache-3.1.9.ebuild | 4 | ||||
-rw-r--r-- | dev-util/ccache/files/ccache-3.1.9-test-gcc-4.8.patch (renamed from dev-util/ccache/files/ccache-3.1.9-test-gcc-3.8.patch) | 18 |
3 files changed, 8 insertions, 21 deletions
diff --git a/dev-util/ccache/ChangeLog b/dev-util/ccache/ChangeLog index 6c327c426e45..ffc94ae34bd2 100644 --- a/dev-util/ccache/ChangeLog +++ b/dev-util/ccache/ChangeLog @@ -1,6 +1,11 @@ # 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.122 2013/04/06 18:28:19 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ChangeLog,v 1.123 2013/04/24 05:44:24 dirtyepic Exp $ + + 24 Apr 2013; Ryan Hill <dirtyepic@gentoo.org> ccache-3.1.9.ebuild, + -files/ccache-3.1.9-test-gcc-3.8.patch, + +files/ccache-3.1.9-test-gcc-4.8.patch: + Fix -Wp,MMD test failure with gcc-4.8 and correct patch name. 06 Apr 2013; Mike Frysinger <vapier@gentoo.org> ccache-3.1.9.ebuild: Only show ccache messages on first emerge #458624 by Pacho Ramos. diff --git a/dev-util/ccache/ccache-3.1.9.ebuild b/dev-util/ccache/ccache-3.1.9.ebuild index ee209a49706b..5bf1a5e01e4b 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.14 2013/04/06 18:28:19 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ccache-3.1.9.ebuild,v 1.15 2013/04/24 05:44:24 dirtyepic Exp $ EAPI="4" @@ -23,7 +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 + epatch "${FILESDIR}"/${P}-test-gcc-4.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-4.8.patch index 4fb654c957f9..2a28baf02984 100644 --- 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-4.8.patch @@ -54,24 +54,6 @@ index 3ed9069..3e38387 100755 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 |