Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/
Date: Sun, 29 Nov 2020 10:11:48
Message-Id: 1606644701.c0220bd1c32e17136dc9efc956da3c276d4e9d2b.grobian@gentoo
1 commit: c0220bd1c32e17136dc9efc956da3c276d4e9d2b
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 29 10:11:24 2020 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 29 10:11:41 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0220bd1
7
8 dev-vcs/git-2.29.2: don't build osxkeychain module with gcc
9
10 Package-Manager: Portage-3.0.9, Repoman-3.0.2
11 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
12
13 dev-vcs/git/git-2.29.2.ebuild | 4 ++--
14 dev-vcs/git/git-9999-r3.ebuild | 4 ++--
15 2 files changed, 4 insertions(+), 4 deletions(-)
16
17 diff --git a/dev-vcs/git/git-2.29.2.ebuild b/dev-vcs/git/git-2.29.2.ebuild
18 index 6e5c5a74a12..ca7a5942fda 100644
19 --- a/dev-vcs/git/git-2.29.2.ebuild
20 +++ b/dev-vcs/git/git-2.29.2.ebuild
21 @@ -341,7 +341,7 @@ src_compile() {
22 || die "emake gitweb (cgi) failed"
23 fi
24
25 - if [[ ${CHOST} == *-darwin* ]]; then
26 + if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
27 pushd contrib/credential/osxkeychain &>/dev/null || die
28 git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
29 || die "emake credential-osxkeychain"
30 @@ -391,7 +391,7 @@ src_compile() {
31 src_install() {
32 git_emake install || die "make install failed"
33
34 - if [[ ${CHOST} == *-darwin* ]]; then
35 + if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
36 dobin contrib/credential/osxkeychain/git-credential-osxkeychain
37 fi
38
39
40 diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
41 index 6e5c5a74a12..ca7a5942fda 100644
42 --- a/dev-vcs/git/git-9999-r3.ebuild
43 +++ b/dev-vcs/git/git-9999-r3.ebuild
44 @@ -341,7 +341,7 @@ src_compile() {
45 || die "emake gitweb (cgi) failed"
46 fi
47
48 - if [[ ${CHOST} == *-darwin* ]]; then
49 + if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
50 pushd contrib/credential/osxkeychain &>/dev/null || die
51 git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
52 || die "emake credential-osxkeychain"
53 @@ -391,7 +391,7 @@ src_compile() {
54 src_install() {
55 git_emake install || die "make install failed"
56
57 - if [[ ${CHOST} == *-darwin* ]]; then
58 + if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
59 dobin contrib/credential/osxkeychain/git-credential-osxkeychain
60 fi