Lines 4-10
Link Here
|
4 |
|
4 |
|
5 |
EAPI=2 |
5 |
EAPI=2 |
6 |
|
6 |
|
7 |
inherit toolchain-funcs eutils elisp-common perl-module bash-completion multilib |
7 |
inherit toolchain-funcs eutils elisp-common perl-module bash-completion multilib flag-o-matic |
8 |
[ "$PV" == "9999" ] && inherit git |
8 |
[ "$PV" == "9999" ] && inherit git |
9 |
|
9 |
|
10 |
MY_PV="${PV/_rc/.rc}" |
10 |
MY_PV="${PV/_rc/.rc}" |
Lines 145-159
Link Here
|
145 |
myopts="${myopts} NO_MKSTEMPS=YesPlease" |
145 |
myopts="${myopts} NO_MKSTEMPS=YesPlease" |
146 |
fi |
146 |
fi |
147 |
if [[ ${CHOST} == *-interix* ]] ; then |
147 |
if [[ ${CHOST} == *-interix* ]] ; then |
148 |
myopts="${myopts} NO_IPV6=YesPlease" |
148 |
[[ ${CHOST} == *-interix6* ]] || \ |
|
|
149 |
myopts="${myopts} NO_IPV6=YesPlease" |
149 |
myopts="${myopts} NO_MEMMEM=YesPlease" |
150 |
myopts="${myopts} NO_MEMMEM=YesPlease" |
150 |
myopts="${myopts} NO_MKDTEMP=YesPlease" |
151 |
myopts="${myopts} NO_MKDTEMP=YesPlease" |
151 |
myopts="${myopts} NO_STRTOUMAX=YesPlease" |
152 |
myopts="${myopts} NO_STRTOUMAX=YesPlease" |
152 |
myopts="${myopts} NO_STRTOULL=YesPlease" |
153 |
myopts="${myopts} NO_STRTOULL=YesPlease" |
153 |
myopts="${myopts} NO_INET_NTOP=YesPlease" |
154 |
[[ ${CHOST} == *-interix6* ]] || \ |
|
|
155 |
myopts="${myopts} NO_INET_NTOP=YesPlease" |
154 |
myopts="${myopts} NO_INET_PTON=YesPlease" |
156 |
myopts="${myopts} NO_INET_PTON=YesPlease" |
155 |
myopts="${myopts} NO_NSEC=YesPlease" |
157 |
myopts="${myopts} NO_NSEC=YesPlease" |
156 |
myopts="${myopts} NO_MKSTEMPS=YesPlease" |
158 |
myopts="${myopts} NO_MKSTEMPS=YesPlease" |
|
|
159 |
append-flags -D_REENTRANT |
157 |
fi |
160 |
fi |
158 |
if [[ ${CHOST} == ia64-*-hpux* ]]; then |
161 |
if [[ ${CHOST} == ia64-*-hpux* ]]; then |
159 |
myopts="${myopts} NO_NSEC=YesPlease" |
162 |
myopts="${myopts} NO_NSEC=YesPlease" |
Lines 197-202
Link Here
|
197 |
#epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch |
200 |
#epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch |
198 |
|
201 |
|
199 |
[[ ${CHOST} == *-mint* ]] && epatch "${FILESDIR}"/${PN}-1.6.3.3-mint.patch |
202 |
[[ ${CHOST} == *-mint* ]] && epatch "${FILESDIR}"/${PN}-1.6.3.3-mint.patch |
|
|
203 |
epatch "${FILESDIR}"/${P}-interix-headers.patch |
200 |
|
204 |
|
201 |
# JS install fixup |
205 |
# JS install fixup |
202 |
epatch "${FILESDIR}"/git-1.6.6-always-install-js.patch |
206 |
epatch "${FILESDIR}"/git-1.6.6-always-install-js.patch |
Lines 385-391
Link Here
|
385 |
|
389 |
|
386 |
cvs=0 |
390 |
cvs=0 |
387 |
use cvs && let cvs=$cvs+1 |
391 |
use cvs && let cvs=$cvs+1 |
388 |
if [[ ${EUID} -eq 0 ]]; then |
392 |
if [[ ${EUID} -eq 0 ]] || [[ ${CHOST} == *-interix* && ${EUID} == 197108 ]]; then |
389 |
if [[ $cvs -eq 1 ]]; then |
393 |
if [[ $cvs -eq 1 ]]; then |
390 |
ewarn "Skipping CVS tests because CVS does not work as root!" |
394 |
ewarn "Skipping CVS tests because CVS does not work as root!" |
391 |
ewarn "You should retest with FEATURES=userpriv!" |
395 |
ewarn "You should retest with FEATURES=userpriv!" |