From f274e813d08b1bcae5088b7c711b34e2fc994655 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sun, 27 Aug 2017 11:07:52 +0200 Subject: [PATCH] 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 50f3a1988c8f6..f650073b5ca74 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 1dd3819d0a778..b588ab7408081 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 17621717d20c7..01272659efb9c 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 1ef3c35807cd5..76bcaf24d0d89 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 98deedf0d9f6e..aa7cf5a5b93d9 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' \