Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/cockroach/
Date: Sat, 06 May 2017 04:59:59
Message-Id: 1494046717.c42dfe87f7283c613e37b0047bcea4a0b97c8654.zmedico@gentoo
1 commit: c42dfe87f7283c613e37b0047bcea4a0b97c8654
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 6 04:58:37 2017 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sat May 6 04:58:37 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c42dfe87
7
8 dev-db/cockroach: check MERGE_TYPE in pkg_pretend
9
10 Package-Manager: Portage-2.3.5, Repoman-2.3.2
11
12 dev-db/cockroach/cockroach-1.0_rc1.ebuild | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15 diff --git a/dev-db/cockroach/cockroach-1.0_rc1.ebuild b/dev-db/cockroach/cockroach-1.0_rc1.ebuild
16 index 18467a3c8a6..13058028014 100644
17 --- a/dev-db/cockroach/cockroach-1.0_rc1.ebuild
18 +++ b/dev-db/cockroach/cockroach-1.0_rc1.ebuild
19 @@ -22,7 +22,7 @@ S="${WORKDIR}/cockroach-${MY_PV}"
20
21 pkg_pretend() {
22 check-reqs_pkg_pretend
23 - if [[ $(gcc-major-version) -lt 6 ]]; then
24 + if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
25 eerror "Cockroach cannot be built with this version of gcc."
26 eerror "You need at least gcc-6.0"
27 die "Your C compiler is too old for this package."