| 1 |
commit: f274e813d08b1bcae5088b7c711b34e2fc994655 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 27 09:07:52 2017 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 27 09:08:09 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f274e813 |
| 7 |
|
| 8 |
dev-vcs/git: fix building on Solaris 10 sparc |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
| 11 |
|
| 12 |
dev-vcs/git/git-2.14.1.ebuild | 5 +++-- |
| 13 |
dev-vcs/git/git-9999-r1.ebuild | 5 +++-- |
| 14 |
dev-vcs/git/git-9999-r2.ebuild | 5 +++-- |
| 15 |
dev-vcs/git/git-9999-r3.ebuild | 5 +++-- |
| 16 |
dev-vcs/git/git-9999.ebuild | 5 +++-- |
| 17 |
5 files changed, 15 insertions(+), 10 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-vcs/git/git-2.14.1.ebuild b/dev-vcs/git/git-2.14.1.ebuild |
| 20 |
index 50f3a1988c8..f650073b5ca 100644 |
| 21 |
--- a/dev-vcs/git/git-2.14.1.ebuild |
| 22 |
+++ b/dev-vcs/git/git-2.14.1.ebuild |
| 23 |
@@ -157,7 +157,7 @@ exportmakeopts() { |
| 24 |
myopts+=" NO_CURL=YesPlease" |
| 25 |
fi |
| 26 |
|
| 27 |
- # broken assumptions, because of broken build system ... |
| 28 |
+ # broken assumptions, because of static build system ... |
| 29 |
myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" |
| 30 |
myopts+=" INSTALL=install TAR=tar" |
| 31 |
myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" |
| 32 |
@@ -219,7 +219,8 @@ exportmakeopts() { |
| 33 |
if [[ ${CHOST} == *-solaris* ]]; then |
| 34 |
myopts+=" NEEDS_LIBICONV=YesPlease" |
| 35 |
myopts+=" HAVE_CLOCK_MONOTONIC=1" |
| 36 |
- myopts+=" HAVE_GETDELIM=1" |
| 37 |
+ grep -q getdelim "${ROOT}"/usr/include/stdio.h && \ |
| 38 |
+ myopts+=" HAVE_GETDELIM=1" |
| 39 |
fi |
| 40 |
|
| 41 |
has_version '>=app-text/asciidoc-8.0' \ |
| 42 |
|
| 43 |
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild |
| 44 |
index 1dd3819d0a7..b588ab74080 100644 |
| 45 |
--- a/dev-vcs/git/git-9999-r1.ebuild |
| 46 |
+++ b/dev-vcs/git/git-9999-r1.ebuild |
| 47 |
@@ -157,7 +157,7 @@ exportmakeopts() { |
| 48 |
myopts+=" NO_CURL=YesPlease" |
| 49 |
fi |
| 50 |
|
| 51 |
- # broken assumptions, because of broken build system ... |
| 52 |
+ # broken assumptions, because of static build system ... |
| 53 |
myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" |
| 54 |
myopts+=" INSTALL=install TAR=tar" |
| 55 |
myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" |
| 56 |
@@ -219,7 +219,8 @@ exportmakeopts() { |
| 57 |
if [[ ${CHOST} == *-solaris* ]]; then |
| 58 |
myopts+=" NEEDS_LIBICONV=YesPlease" |
| 59 |
myopts+=" HAVE_CLOCK_MONOTONIC=1" |
| 60 |
- myopts+=" HAVE_GETDELIM=1" |
| 61 |
+ grep -q getdelim "${ROOT}"/usr/include/stdio.h && \ |
| 62 |
+ myopts+=" HAVE_GETDELIM=1" |
| 63 |
fi |
| 64 |
|
| 65 |
has_version '>=app-text/asciidoc-8.0' \ |
| 66 |
|
| 67 |
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild |
| 68 |
index 17621717d20..01272659efb 100644 |
| 69 |
--- a/dev-vcs/git/git-9999-r2.ebuild |
| 70 |
+++ b/dev-vcs/git/git-9999-r2.ebuild |
| 71 |
@@ -157,7 +157,7 @@ exportmakeopts() { |
| 72 |
myopts+=" NO_CURL=YesPlease" |
| 73 |
fi |
| 74 |
|
| 75 |
- # broken assumptions, because of broken build system ... |
| 76 |
+ # broken assumptions, because of static build system ... |
| 77 |
myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" |
| 78 |
myopts+=" INSTALL=install TAR=tar" |
| 79 |
myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" |
| 80 |
@@ -219,7 +219,8 @@ exportmakeopts() { |
| 81 |
if [[ ${CHOST} == *-solaris* ]]; then |
| 82 |
myopts+=" NEEDS_LIBICONV=YesPlease" |
| 83 |
myopts+=" HAVE_CLOCK_MONOTONIC=1" |
| 84 |
- myopts+=" HAVE_GETDELIM=1" |
| 85 |
+ grep -q getdelim "${ROOT}"/usr/include/stdio.h && \ |
| 86 |
+ myopts+=" HAVE_GETDELIM=1" |
| 87 |
fi |
| 88 |
|
| 89 |
has_version '>=app-text/asciidoc-8.0' \ |
| 90 |
|
| 91 |
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild |
| 92 |
index 1ef3c35807c..76bcaf24d0d 100644 |
| 93 |
--- a/dev-vcs/git/git-9999-r3.ebuild |
| 94 |
+++ b/dev-vcs/git/git-9999-r3.ebuild |
| 95 |
@@ -157,7 +157,7 @@ exportmakeopts() { |
| 96 |
myopts+=" NO_CURL=YesPlease" |
| 97 |
fi |
| 98 |
|
| 99 |
- # broken assumptions, because of broken build system ... |
| 100 |
+ # broken assumptions, because of static build system ... |
| 101 |
myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" |
| 102 |
myopts+=" INSTALL=install TAR=tar" |
| 103 |
myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" |
| 104 |
@@ -219,7 +219,8 @@ exportmakeopts() { |
| 105 |
if [[ ${CHOST} == *-solaris* ]]; then |
| 106 |
myopts+=" NEEDS_LIBICONV=YesPlease" |
| 107 |
myopts+=" HAVE_CLOCK_MONOTONIC=1" |
| 108 |
- myopts+=" HAVE_GETDELIM=1" |
| 109 |
+ grep -q getdelim "${ROOT}"/usr/include/stdio.h && \ |
| 110 |
+ myopts+=" HAVE_GETDELIM=1" |
| 111 |
fi |
| 112 |
|
| 113 |
has_version '>=app-text/asciidoc-8.0' \ |
| 114 |
|
| 115 |
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild |
| 116 |
index 98deedf0d9f..aa7cf5a5b93 100644 |
| 117 |
--- a/dev-vcs/git/git-9999.ebuild |
| 118 |
+++ b/dev-vcs/git/git-9999.ebuild |
| 119 |
@@ -157,7 +157,7 @@ exportmakeopts() { |
| 120 |
myopts+=" NO_CURL=YesPlease" |
| 121 |
fi |
| 122 |
|
| 123 |
- # broken assumptions, because of broken build system ... |
| 124 |
+ # broken assumptions, because of static build system ... |
| 125 |
myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" |
| 126 |
myopts+=" INSTALL=install TAR=tar" |
| 127 |
myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" |
| 128 |
@@ -219,7 +219,8 @@ exportmakeopts() { |
| 129 |
if [[ ${CHOST} == *-solaris* ]]; then |
| 130 |
myopts+=" NEEDS_LIBICONV=YesPlease" |
| 131 |
myopts+=" HAVE_CLOCK_MONOTONIC=1" |
| 132 |
- myopts+=" HAVE_GETDELIM=1" |
| 133 |
+ grep -q getdelim "${ROOT}"/usr/include/stdio.h && \ |
| 134 |
+ myopts+=" HAVE_GETDELIM=1" |
| 135 |
fi |
| 136 |
|
| 137 |
has_version '>=app-text/asciidoc-8.0' \ |
Archives