dev-vcs/git: fix building on Solaris 10 sparc

Package-Manager: Portage-2.3.6, Repoman-2.3.1

diff --git a/dev-vcs/git/git-2.14.1.ebuild b/dev-vcs/git/git-2.14.1.ebuild
index 50f3a1988c8f6da0be191cfe34276c7ab922199e..f650073b5ca7483785a918657efaf0af10036fc8 100644 (file)
--- a/dev-vcs/git/git-2.14.1.ebuild
+++ b/dev-vcs/git/git-2.14.1.ebuild
@@ -157,7 +157,7 @@ exportmakeopts() {
                myopts+=" NO_CURL=YesPlease"
        fi
 
-       # broken assumptions, because of broken build system ...
+       # broken assumptions, because of static build system ...
        myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
        myopts+=" INSTALL=install TAR=tar"
        myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
@@ -219,7 +219,8 @@ exportmakeopts() {
        if [[ ${CHOST} == *-solaris* ]]; then
                myopts+=" NEEDS_LIBICONV=YesPlease"
                myopts+=" HAVE_CLOCK_MONOTONIC=1"
-               myopts+=" HAVE_GETDELIM=1"
+               grep -q getdelim "${ROOT}"/usr/include/stdio.h && \
+                       myopts+=" HAVE_GETDELIM=1"
        fi
 
        has_version '>=app-text/asciidoc-8.0' \

diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 1dd3819d0a778b7014a6fd2e4377766ccae67afa..b588ab740808196c7bfb125cf832913a5aea17b3 100644 (file)
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -157,7 +157,7 @@ exportmakeopts() {
                myopts+=" NO_CURL=YesPlease"
        fi
 
-       # broken assumptions, because of broken build system ...
+       # broken assumptions, because of static build system ...
        myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
        myopts+=" INSTALL=install TAR=tar"
        myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
@@ -219,7 +219,8 @@ exportmakeopts() {
        if [[ ${CHOST} == *-solaris* ]]; then
                myopts+=" NEEDS_LIBICONV=YesPlease"
                myopts+=" HAVE_CLOCK_MONOTONIC=1"
-               myopts+=" HAVE_GETDELIM=1"
+               grep -q getdelim "${ROOT}"/usr/include/stdio.h && \
+                       myopts+=" HAVE_GETDELIM=1"
        fi
 
        has_version '>=app-text/asciidoc-8.0' \

diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 17621717d20c7103eee5a55c722cc647d6fad915..01272659efb9c79636c0502670c0a8d061e14a63 100644 (file)
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -157,7 +157,7 @@ exportmakeopts() {
                myopts+=" NO_CURL=YesPlease"
        fi
 
-       # broken assumptions, because of broken build system ...
+       # broken assumptions, because of static build system ...
        myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
        myopts+=" INSTALL=install TAR=tar"
        myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
@@ -219,7 +219,8 @@ exportmakeopts() {
        if [[ ${CHOST} == *-solaris* ]]; then
                myopts+=" NEEDS_LIBICONV=YesPlease"
                myopts+=" HAVE_CLOCK_MONOTONIC=1"
-               myopts+=" HAVE_GETDELIM=1"
+               grep -q getdelim "${ROOT}"/usr/include/stdio.h && \
+                       myopts+=" HAVE_GETDELIM=1"
        fi
 
        has_version '>=app-text/asciidoc-8.0' \

diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 1ef3c35807cd51a4ae68f900f5e2132bdf0cefe6..76bcaf24d0d8924f2b05866deba9bb1566e380ef 100644 (file)
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -157,7 +157,7 @@ exportmakeopts() {
                myopts+=" NO_CURL=YesPlease"
        fi
 
-       # broken assumptions, because of broken build system ...
+       # broken assumptions, because of static build system ...
        myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
        myopts+=" INSTALL=install TAR=tar"
        myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
@@ -219,7 +219,8 @@ exportmakeopts() {
        if [[ ${CHOST} == *-solaris* ]]; then
                myopts+=" NEEDS_LIBICONV=YesPlease"
                myopts+=" HAVE_CLOCK_MONOTONIC=1"
-               myopts+=" HAVE_GETDELIM=1"
+               grep -q getdelim "${ROOT}"/usr/include/stdio.h && \
+                       myopts+=" HAVE_GETDELIM=1"
        fi
 
        has_version '>=app-text/asciidoc-8.0' \

diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 98deedf0d9f6e5dd6cf8130bac7584ea2b87e9f7..aa7cf5a5b93d963fe5470ae6dd3875ffbcb7af53 100644 (file)
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -157,7 +157,7 @@ exportmakeopts() {
                myopts+=" NO_CURL=YesPlease"
        fi
 
-       # broken assumptions, because of broken build system ...
+       # broken assumptions, because of static build system ...
        myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
        myopts+=" INSTALL=install TAR=tar"
        myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
@@ -219,7 +219,8 @@ exportmakeopts() {
        if [[ ${CHOST} == *-solaris* ]]; then
                myopts+=" NEEDS_LIBICONV=YesPlease"
                myopts+=" HAVE_CLOCK_MONOTONIC=1"
-               myopts+=" HAVE_GETDELIM=1"
+               grep -q getdelim "${ROOT}"/usr/include/stdio.h && \
+                       myopts+=" HAVE_GETDELIM=1"
        fi
 
        has_version '>=app-text/asciidoc-8.0' \