commit: b79e40dcfe1e580f77830d2fbdf037433c4d81b6 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Wed Apr 24 11:17:24 2019 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Wed Apr 24 11:17:42 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b79e40dc
dev-vcs/git: Fixed build on uclibc systems with USE="iconv" Thanks-to: René Rhéaume <rene.rheaume <AT> gmail.com> Closes: https://bugs.gentoo.org/557122 Package-Manager: Portage-2.3.64, Repoman-2.3.12 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> dev-vcs/git/git-2.19.2.ebuild | 4 +++- dev-vcs/git/git-2.20.1.ebuild | 4 +++- dev-vcs/git/git-2.21.0-r1.ebuild | 4 +++- dev-vcs/git/git-2.21.0-r2.ebuild | 4 +++- dev-vcs/git/git-2.21.0.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, 27 insertions(+), 9 deletions(-) diff --git a/dev-vcs/git/git-2.19.2.ebuild b/dev-vcs/git/git-2.19.2.ebuild index 2485c41c551..01a982d56b3 100644 --- a/dev-vcs/git/git-2.19.2.ebuild +++ b/dev-vcs/git/git-2.19.2.ebuild @@ -241,8 +241,10 @@ exportmakeopts() { # Bug 290465: # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ + if [[ "${CHOST}" == *-uclibc* ]] ; then myopts+=( NO_NSEC=YesPlease ) + use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) + fi export MY_MAKEOPTS="${myopts[@]}" export EXTLIBS="${extlibs}" diff --git a/dev-vcs/git/git-2.20.1.ebuild b/dev-vcs/git/git-2.20.1.ebuild index 578fe8036f5..6164d3b78d7 100644 --- a/dev-vcs/git/git-2.20.1.ebuild +++ b/dev-vcs/git/git-2.20.1.ebuild @@ -241,8 +241,10 @@ exportmakeopts() { # Bug 290465: # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ + if [[ "${CHOST}" == *-uclibc* ]] ; then myopts+=( NO_NSEC=YesPlease ) + use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) + fi export MY_MAKEOPTS="${myopts[@]}" export EXTLIBS="${extlibs}" diff --git a/dev-vcs/git/git-2.21.0-r1.ebuild b/dev-vcs/git/git-2.21.0-r1.ebuild index a46eb7533fd..e6ce3acc0a0 100644 --- a/dev-vcs/git/git-2.21.0-r1.ebuild +++ b/dev-vcs/git/git-2.21.0-r1.ebuild @@ -241,8 +241,10 @@ exportmakeopts() { # Bug 290465: # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ + if [[ "${CHOST}" == *-uclibc* ]] ; then myopts+=( NO_NSEC=YesPlease ) + use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) + fi export MY_MAKEOPTS="${myopts[@]}" export EXTLIBS="${extlibs[@]}" diff --git a/dev-vcs/git/git-2.21.0-r2.ebuild b/dev-vcs/git/git-2.21.0-r2.ebuild index 0560e22b3ff..7c26a1a93c1 100644 --- a/dev-vcs/git/git-2.21.0-r2.ebuild +++ b/dev-vcs/git/git-2.21.0-r2.ebuild @@ -244,8 +244,10 @@ exportmakeopts() { # Bug 290465: # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ + if [[ "${CHOST}" == *-uclibc* ]] ; then myopts+=( NO_NSEC=YesPlease ) + use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) + fi export MY_MAKEOPTS="${myopts[@]}" export EXTLIBS="${extlibs[@]}" diff --git a/dev-vcs/git/git-2.21.0.ebuild b/dev-vcs/git/git-2.21.0.ebuild index 7144f46a58e..632c8af1a3c 100644 --- a/dev-vcs/git/git-2.21.0.ebuild +++ b/dev-vcs/git/git-2.21.0.ebuild @@ -241,8 +241,10 @@ exportmakeopts() { # Bug 290465: # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ + if [[ "${CHOST}" == *-uclibc* ]] ; then myopts+=( NO_NSEC=YesPlease ) + use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) + fi export MY_MAKEOPTS="${myopts[@]}" export EXTLIBS="${extlibs[@]}" diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index 5d6ae9ba9b6..62eaae02849 100644 --- a/dev-vcs/git/git-9999-r1.ebuild +++ b/dev-vcs/git/git-9999-r1.ebuild @@ -241,8 +241,10 @@ exportmakeopts() { # Bug 290465: # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ + if [[ "${CHOST}" == *-uclibc* ]] ; then myopts+=( NO_NSEC=YesPlease ) + use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) + fi export MY_MAKEOPTS="${myopts[@]}" export EXTLIBS="${extlibs[@]}" diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index 5d6ae9ba9b6..62eaae02849 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.ebuild @@ -241,8 +241,10 @@ exportmakeopts() { # Bug 290465: # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ + if [[ "${CHOST}" == *-uclibc* ]] ; then myopts+=( NO_NSEC=YesPlease ) + use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) + fi export MY_MAKEOPTS="${myopts[@]}" export EXTLIBS="${extlibs[@]}" diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index 5d6ae9ba9b6..62eaae02849 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.ebuild @@ -241,8 +241,10 @@ exportmakeopts() { # Bug 290465: # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ + if [[ "${CHOST}" == *-uclibc* ]] ; then myopts+=( NO_NSEC=YesPlease ) + use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) + fi export MY_MAKEOPTS="${myopts[@]}" export EXTLIBS="${extlibs[@]}" diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index 5d6ae9ba9b6..62eaae02849 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.ebuild @@ -241,8 +241,10 @@ exportmakeopts() { # Bug 290465: # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ + if [[ "${CHOST}" == *-uclibc* ]] ; then myopts+=( NO_NSEC=YesPlease ) + use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) + fi export MY_MAKEOPTS="${myopts[@]}" export EXTLIBS="${extlibs[@]}"
