dev-vcs/git: Fixed build on uclibc systems with USE="iconv"

Thanks-to: René Rhéaume <rene.rheaume@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@gentoo.org>

diff --git a/dev-vcs/git/git-2.19.2.ebuild b/dev-vcs/git/git-2.19.2.ebuild
index 2485c41c5511bc7d15aa7e56d6b408f6dde0ea27..01a982d56b3d61afbfe9fc946e8aa284e6318e4a 100644 (file)
--- 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 578fe8036f584f89cb8d71c801b1cb860f3a176d..6164d3b78d7b62846945609a673f3fe0deb97f4d 100644 (file)
--- 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 a46eb7533fd439ee20f124daf590c8e88237c288..e6ce3acc0a0e5be13d78d2aa8607d14362fba80d 100644 (file)
--- 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 0560e22b3ff25883c6f669b3c71ad47267996aa5..7c26a1a93c155ca09cb1d6b3dd4a0e168dcbda8a 100644 (file)
--- 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 7144f46a58ea1b890640006ea2528ca4aa365dfe..632c8af1a3c082ed854d76f9b82528311e1541e8 100644 (file)
--- 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 5d6ae9ba9b66561ab9d531ef323e5af82933e896..62eaae0284953e7f0cbfb28cd2cf13903daf4142 100644 (file)
--- 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 5d6ae9ba9b66561ab9d531ef323e5af82933e896..62eaae0284953e7f0cbfb28cd2cf13903daf4142 100644 (file)
--- 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 5d6ae9ba9b66561ab9d531ef323e5af82933e896..62eaae0284953e7f0cbfb28cd2cf13903daf4142 100644 (file)
--- 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 5d6ae9ba9b66561ab9d531ef323e5af82933e896..62eaae0284953e7f0cbfb28cd2cf13903daf4142 100644 (file)
--- 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[@]}"