|
Lines 228-234
Link Here
|
| 228 |
fi |
212 |
fi |
| 229 |
|
213 |
|
| 230 |
if [[ ${build_apache2} = 1 ]] ; then |
214 |
if [[ ${build_apache2} = 1 ]] ; then |
| 231 |
my_conf="${my_conf} --with-apxs2=/usr/sbin/apxs2" |
215 |
my_conf="${my_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs2" |
| 232 |
|
216 |
|
| 233 |
# Threaded Apache2 support |
217 |
# Threaded Apache2 support |
| 234 |
if use threads ; then |
218 |
if use threads ; then |
|
Lines 340-346
Link Here
|
| 340 |
cp sapi/cgi/php-cgi php-cgi || die "Unable to copy CGI SAPI" |
324 |
cp sapi/cgi/php-cgi php-cgi || die "Unable to copy CGI SAPI" |
| 341 |
;; |
325 |
;; |
| 342 |
apache2) |
326 |
apache2) |
| 343 |
my_conf="${my_conf} --disable-cli --with-apxs2=/usr/sbin/apxs2" |
327 |
my_conf="${my_conf} --disable-cli --with-apxs2=${EPREFIX}/usr/sbin/apxs2" |
| 344 |
php5_2-sapi_src_compile |
328 |
php5_2-sapi_src_compile |
| 345 |
;; |
329 |
;; |
| 346 |
esac |
330 |
esac |
|
Lines 353-359
Link Here
|
| 353 |
src_install() { |
337 |
src_install() { |
| 354 |
php_determine_sapis |
338 |
php_determine_sapis |
| 355 |
|
339 |
|
| 356 |
destdir=/usr/$(get_libdir)/php5 |
340 |
destdir=${EPREFIX}/usr/$(get_libdir)/php5 |
| 357 |
|
341 |
|
| 358 |
# Let the eclass do the common work |
342 |
# Let the eclass do the common work |
| 359 |
php5_2-sapi_src_install |
343 |
php5_2-sapi_src_install |
|
Lines 444-451
Link Here
|
| 444 |
php-select php php5 |
428 |
php-select php php5 |
| 445 |
elif [[ ${exitStatus} == 4 ]] ; then |
429 |
elif [[ ${exitStatus} == 4 ]] ; then |
| 446 |
ewarn |
430 |
ewarn |
| 447 |
ewarn "/usr/bin/php links to a different version of PHP." |
431 |
ewarn "${EPREFIX}/usr/bin/php links to a different version of PHP." |
| 448 |
ewarn "To make /usr/bin/php point to PHP v5, use php-select:" |
432 |
ewarn "To make ${EPREFIX}/usr/bin/php point to PHP v5, use php-select:" |
| 449 |
ewarn |
433 |
ewarn |
| 450 |
ewarn " php-select php php5" |
434 |
ewarn " php-select php php5" |
| 451 |
ewarn |
435 |
ewarn |
|
Lines 460-467
Link Here
|
| 460 |
php-select php-cgi php5 |
444 |
php-select php-cgi php5 |
| 461 |
elif [[ ${exitStatus} == 4 ]] ; then |
445 |
elif [[ ${exitStatus} == 4 ]] ; then |
| 462 |
ewarn |
446 |
ewarn |
| 463 |
ewarn "/usr/bin/php-cgi links to a different version of PHP." |
447 |
ewarn "${EPREFIX}/usr/bin/php-cgi links to a different version of PHP." |
| 464 |
ewarn "To make /usr/bin/php-cgi point to PHP v5, use php-select:" |
448 |
ewarn "To make ${EPREFIX}/usr/bin/php-cgi point to PHP v5, use php-select:" |
| 465 |
ewarn |
449 |
ewarn |
| 466 |
ewarn " php-select php-cgi php5" |
450 |
ewarn " php-select php-cgi php5" |
| 467 |
ewarn |
451 |
ewarn |
|
Lines 475-481
Link Here
|
| 475 |
php-select php-devel php5 |
459 |
php-select php-devel php5 |
| 476 |
elif [[ $exitStatus == 4 ]] ; then |
460 |
elif [[ $exitStatus == 4 ]] ; then |
| 477 |
ewarn |
461 |
ewarn |
| 478 |
ewarn "/usr/bin/php-config and/or /usr/bin/phpize are linked to a" |
462 |
ewarn "${EPREFIX}/usr/bin/php-config and/or ${EPREFIX}/usr/bin/phpize are linked to a" |
| 479 |
ewarn "different version of PHP. To make them point to PHP v5, use" |
463 |
ewarn "different version of PHP. To make them point to PHP v5, use" |
| 480 |
ewarn "php-select:" |
464 |
ewarn "php-select:" |
| 481 |
ewarn |
465 |
ewarn |
