Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/ccache/, dev-util/ccache/files/
Date: Mon, 15 Oct 2018 21:13:43
Message-Id: 1539638009.3da825677c3cbf7385055a047f2b2801f34fc31f.slyfox@gentoo
1 commit: 3da825677c3cbf7385055a047f2b2801f34fc31f
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 15 21:13:00 2018 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 15 21:13:29 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3da82567
7
8 dev-util/ccache: disable nvcc tests
9
10 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.11
12
13 dev-util/ccache/ccache-3.5.ebuild | 1 +
14 dev-util/ccache/files/ccache-3.5-nvcc-test.patch | 11 +++++++++++
15 2 files changed, 12 insertions(+)
16
17 diff --git a/dev-util/ccache/ccache-3.5.ebuild b/dev-util/ccache/ccache-3.5.ebuild
18 index ea736149c66..e2a525cad94 100644
19 --- a/dev-util/ccache/ccache-3.5.ebuild
20 +++ b/dev-util/ccache/ccache-3.5.ebuild
21 @@ -22,6 +22,7 @@ RDEPEND="${DEPEND}
22
23 PATCHES=(
24 "${FILESDIR}"/${PN}-3.4-size-on-disk.patch #456178
25 + "${FILESDIR}"/${PN}-3.5-nvcc-test.patch
26 )
27
28 src_prepare() {
29
30 diff --git a/dev-util/ccache/files/ccache-3.5-nvcc-test.patch b/dev-util/ccache/files/ccache-3.5-nvcc-test.patch
31 new file mode 100644
32 index 00000000000..294b2243907
33 --- /dev/null
34 +++ b/dev-util/ccache/files/ccache-3.5-nvcc-test.patch
35 @@ -0,0 +1,11 @@
36 +Disable 'nvcc' tests to avoid test failure
37 +on system with gcc-7+ enabled by default.
38 +--- a/test/run
39 ++++ b/test/run
40 +@@ -425,2 +425,6 @@ else
41 + fi
42 ++# Disable nvcc tests in Gentoo as nvcc requires gcc<7.
43 ++# Not a default normally.
44 ++REAL_NVCC=
45 ++REAL_CUOBJDUMP=
46 + echo