[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/

Sun, 27 Aug 2017 02:08:36 -0700 

commit:     f274e813d08b1bcae5088b7c711b34e2fc994655
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 27 09:07:52 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Aug 27 09:08:09 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f274e813

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

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 dev-vcs/git/git-2.14.1.ebuild  | 5 +++--
 dev-vcs/git/git-9999-r1.ebuild | 5 +++--
 dev-vcs/git/git-9999-r2.ebuild | 5 +++--
 dev-vcs/git/git-9999-r3.ebuild | 5 +++--
 dev-vcs/git/git-9999.ebuild    | 5 +++--
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/dev-vcs/git/git-2.14.1.ebuild b/dev-vcs/git/git-2.14.1.ebuild
index 50f3a1988c8..f650073b5ca 100644
--- 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 1dd3819d0a7..b588ab74080 100644
--- 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 17621717d20..01272659efb 100644
--- 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 1ef3c35807c..76bcaf24d0d 100644
--- 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 98deedf0d9f..aa7cf5a5b93 100644
--- 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' \

Reply via email to