commit: 538e155ff09754d737e20142b6519fb7b25c22d4 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Sun Jan 16 09:33:37 2022 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Sun Jan 16 09:33:37 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=538e155f
dev-vcs/git: fix osxkeychain conditional, thanks Arfrever Closes: https://bugs.gentoo.org/831276 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> dev-vcs/git/git-2.32.0-r1.ebuild | 4 ++-- dev-vcs/git/git-2.33.1.ebuild | 4 ++-- dev-vcs/git/git-2.34.1-r1.ebuild | 4 ++-- dev-vcs/git/git-2.34.1.ebuild | 4 ++-- dev-vcs/git/git-2.35.0_rc1.ebuild | 4 ++-- dev-vcs/git/git-9999-r1.ebuild | 4 ++-- dev-vcs/git/git-9999-r2.ebuild | 4 ++-- dev-vcs/git/git-9999-r3.ebuild | 4 ++-- dev-vcs/git/git-9999.ebuild | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dev-vcs/git/git-2.32.0-r1.ebuild b/dev-vcs/git/git-2.32.0-r1.ebuild index 6c3d422fd38b..c2d24bdf91ed 100644 --- a/dev-vcs/git/git-2.32.0-r1.ebuild +++ b/dev-vcs/git/git-2.32.0-r1.ebuild @@ -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" @@ -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 diff --git a/dev-vcs/git/git-2.33.1.ebuild b/dev-vcs/git/git-2.33.1.ebuild index 26673133f9f9..ab8a8a02552e 100644 --- a/dev-vcs/git/git-2.33.1.ebuild +++ b/dev-vcs/git/git-2.33.1.ebuild @@ -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" @@ -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 diff --git a/dev-vcs/git/git-2.34.1-r1.ebuild b/dev-vcs/git/git-2.34.1-r1.ebuild index c77551019c67..075208f7ce0d 100644 --- a/dev-vcs/git/git-2.34.1-r1.ebuild +++ b/dev-vcs/git/git-2.34.1-r1.ebuild @@ -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" @@ -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 diff --git a/dev-vcs/git/git-2.34.1.ebuild b/dev-vcs/git/git-2.34.1.ebuild index 30f56796419f..99934132cd97 100644 --- a/dev-vcs/git/git-2.34.1.ebuild +++ b/dev-vcs/git/git-2.34.1.ebuild @@ -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" @@ -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 diff --git a/dev-vcs/git/git-2.35.0_rc1.ebuild b/dev-vcs/git/git-2.35.0_rc1.ebuild index c77551019c67..075208f7ce0d 100644 --- a/dev-vcs/git/git-2.35.0_rc1.ebuild +++ b/dev-vcs/git/git-2.35.0_rc1.ebuild @@ -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" @@ -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 diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index c77551019c67..075208f7ce0d 100644 --- a/dev-vcs/git/git-9999-r1.ebuild +++ b/dev-vcs/git/git-9999-r1.ebuild @@ -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" @@ -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 diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index c77551019c67..075208f7ce0d 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.ebuild @@ -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" @@ -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 diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index c77551019c67..075208f7ce0d 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.ebuild @@ -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" @@ -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 diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index c77551019c67..075208f7ce0d 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.ebuild @@ -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" @@ -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
