[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/

[Fabian Groffen]

commit:     4f4340f877b5bdfd5f35cdcc98696b591a434e95
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  9 07:54:41 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Apr  9 07:57:49 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f4340f8

dev-vcs/git: respect CC/CFLAGS while building osxkeychain credential on Darwin

Package-Manager: portage-2.2.27

 dev-vcs/git/git-2.8.1.ebuild   | 5 +++--
 dev-vcs/git/git-9999-r1.ebuild | 5 +++--
 dev-vcs/git/git-9999-r2.ebuild | 5 +++--
 dev-vcs/git/git-9999-r3.ebuild | 5 +++--
 dev-vcs/git/git-9999.ebuild    | 5 +++--
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/dev-vcs/git/git-2.8.1.ebuild b/dev-vcs/git/git-2.8.1.ebuild
index 2497aa5..89aef01 100644
--- a/dev-vcs/git/git-2.8.1.ebuild
+++ b/dev-vcs/git/git-2.8.1.ebuild
@@ -330,8 +330,9 @@ src_compile() {
        fi
 
        if [[ ${CHOST} == *-darwin* ]]; then
-               cd "${S}"/contrib/credential/osxkeychain || die "cd 
credential/osxkeychain"
-               git_emake || die "emake credential-osxkeychain"
+               cd "${S}"/contrib/credential/osxkeychain || die
+               git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
+                       || die "emake credential-osxkeychain"
        fi
 
        cd "${S}"/Documentation

diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 9064287..69b91db 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -330,8 +330,9 @@ src_compile() {
        fi
 
        if [[ ${CHOST} == *-darwin* ]]; then
-               cd "${S}"/contrib/credential/osxkeychain || die "cd 
credential/osxkeychain"
-               git_emake || die "emake credential-osxkeychain"
+               cd "${S}"/contrib/credential/osxkeychain || die
+               git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
+                       || die "emake credential-osxkeychain"
        fi
 
        cd "${S}"/Documentation

diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 56b5b6b..4de6ab7 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -330,8 +330,9 @@ src_compile() {
        fi
 
        if [[ ${CHOST} == *-darwin* ]]; then
-               cd "${S}"/contrib/credential/osxkeychain || die "cd 
credential/osxkeychain"
-               git_emake || die "emake credential-osxkeychain"
+               cd "${S}"/contrib/credential/osxkeychain || die
+               git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
+                       || die "emake credential-osxkeychain"
        fi
 
        cd "${S}"/Documentation

diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 2497aa5..89aef01 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -330,8 +330,9 @@ src_compile() {
        fi
 
        if [[ ${CHOST} == *-darwin* ]]; then
-               cd "${S}"/contrib/credential/osxkeychain || die "cd 
credential/osxkeychain"
-               git_emake || die "emake credential-osxkeychain"
+               cd "${S}"/contrib/credential/osxkeychain || die
+               git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
+                       || die "emake credential-osxkeychain"
        fi
 
        cd "${S}"/Documentation

diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 5fbd631..596de37 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -330,8 +330,9 @@ src_compile() {
        fi
 
        if [[ ${CHOST} == *-darwin* ]]; then
-               cd "${S}"/contrib/credential/osxkeychain || die "cd 
credential/osxkeychain"
-               git_emake || die "emake credential-osxkeychain"
+               cd "${S}"/contrib/credential/osxkeychain || die
+               git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
+                       || die "emake credential-osxkeychain"
        fi
 
        cd "${S}"/Documentation