Skip to content

Commit

Permalink
dev-vcs/git: fix osxkeychain conditional, thanks Arfrever
Browse files Browse the repository at this point in the history 
Closes: https://bugs.gentoo.org/831276
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Fabian Groffen <[email protected]>
  • Loading branch information
@grobian
grobian committed Jan 16, 2022
1 parent c7fd7ef commit 538e155
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions dev-vcs/git/git-2.32.0-r1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ src_compile() {
git_emake gitweb || die "emake gitweb (cgi) failed"
fi

if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
pushd contrib/credential/osxkeychain &>/dev/null || die
git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
|| die "emake credential-osxkeychain"
Expand Down Expand Up @@ -362,7 +362,7 @@ src_compile() {
src_install() {
git_emake DESTDIR="${D}" install || die "make install failed"

if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
dobin contrib/credential/osxkeychain/git-credential-osxkeychain
fi

Expand Down
4 changes: 2 additions & 2 deletions dev-vcs/git/git-2.33.1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ src_compile() {
git_emake gitweb || die "emake gitweb (cgi) failed"
fi

if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
pushd contrib/credential/osxkeychain &>/dev/null || die
git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
|| die "emake credential-osxkeychain"
Expand Down Expand Up @@ -358,7 +358,7 @@ src_compile() {
src_install() {
git_emake DESTDIR="${D}" install || die "make install failed"

if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
dobin contrib/credential/osxkeychain/git-credential-osxkeychain
fi

Expand Down
4 changes: 2 additions & 2 deletions dev-vcs/git/git-2.34.1-r1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ src_compile() {
git_emake gitweb || die "emake gitweb (cgi) failed"
fi

if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
pushd contrib/credential/osxkeychain &>/dev/null || die
git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
|| die "emake credential-osxkeychain"
Expand Down Expand Up @@ -358,7 +358,7 @@ src_compile() {
src_install() {
git_emake DESTDIR="${D}" install || die "make install failed"

if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
dobin contrib/credential/osxkeychain/git-credential-osxkeychain
fi

Expand Down
4 changes: 2 additions & 2 deletions dev-vcs/git/git-2.34.1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ src_compile() {
git_emake gitweb || die "emake gitweb (cgi) failed"
fi

if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
pushd contrib/credential/osxkeychain &>/dev/null || die
git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
|| die "emake credential-osxkeychain"
Expand Down Expand Up @@ -358,7 +358,7 @@ src_compile() {
src_install() {
git_emake DESTDIR="${D}" install || die "make install failed"

if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
dobin contrib/credential/osxkeychain/git-credential-osxkeychain
fi

Expand Down
4 changes: 2 additions & 2 deletions dev-vcs/git/git-2.35.0_rc1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ src_compile() {
git_emake gitweb || die "emake gitweb (cgi) failed"
fi

if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
pushd contrib/credential/osxkeychain &>/dev/null || die
git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
|| die "emake credential-osxkeychain"
Expand Down Expand Up @@ -358,7 +358,7 @@ src_compile() {
src_install() {
git_emake DESTDIR="${D}" install || die "make install failed"

if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
dobin contrib/credential/osxkeychain/git-credential-osxkeychain
fi

Expand Down
4 changes: 2 additions & 2 deletions dev-vcs/git/git-9999-r1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ src_compile() {
git_emake gitweb || die "emake gitweb (cgi) failed"
fi

if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
pushd contrib/credential/osxkeychain &>/dev/null || die
git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
|| die "emake credential-osxkeychain"
Expand Down Expand Up @@ -358,7 +358,7 @@ src_compile() {
src_install() {
git_emake DESTDIR="${D}" install || die "make install failed"

if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
dobin contrib/credential/osxkeychain/git-credential-osxkeychain
fi

Expand Down
4 changes: 2 additions & 2 deletions dev-vcs/git/git-9999-r2.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ src_compile() {
git_emake gitweb || die "emake gitweb (cgi) failed"
fi

if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
pushd contrib/credential/osxkeychain &>/dev/null || die
git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
|| die "emake credential-osxkeychain"
Expand Down Expand Up @@ -358,7 +358,7 @@ src_compile() {
src_install() {
git_emake DESTDIR="${D}" install || die "make install failed"

if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
dobin contrib/credential/osxkeychain/git-credential-osxkeychain
fi

Expand Down
4 changes: 2 additions & 2 deletions dev-vcs/git/git-9999-r3.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ src_compile() {
git_emake gitweb || die "emake gitweb (cgi) failed"
fi

if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
pushd contrib/credential/osxkeychain &>/dev/null || die
git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
|| die "emake credential-osxkeychain"
Expand Down Expand Up @@ -358,7 +358,7 @@ src_compile() {
src_install() {
git_emake DESTDIR="${D}" install || die "make install failed"

if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
dobin contrib/credential/osxkeychain/git-credential-osxkeychain
fi

Expand Down
4 changes: 2 additions & 2 deletions dev-vcs/git/git-9999.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ src_compile() {
git_emake gitweb || die "emake gitweb (cgi) failed"
fi

if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
pushd contrib/credential/osxkeychain &>/dev/null || die
git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
|| die "emake credential-osxkeychain"
Expand Down Expand Up @@ -358,7 +358,7 @@ src_compile() {
src_install() {
git_emake DESTDIR="${D}" install || die "make install failed"

if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
dobin contrib/credential/osxkeychain/git-credential-osxkeychain
fi

Expand Down

0 comments on commit 538e155

Please sign in to comment.