|
Lines 8-14
Link Here
|
| 8 |
APACHE2_SAPI_USE="concurrentmodphp threads" |
8 |
APACHE2_SAPI_USE="concurrentmodphp threads" |
| 9 |
IUSE="cli cgi ${CGI_SAPI_USE} ${APACHE2_SAPI_USE} fastbuild" |
9 |
IUSE="cli cgi ${CGI_SAPI_USE} ${APACHE2_SAPI_USE} fastbuild" |
| 10 |
|
10 |
|
| 11 |
KEYWORDS="~amd64-linux ~ia64-linux ~x86-linux ~x86-freebsd ~x86-macos" |
11 |
KEYWORDS="~amd64-linux ~ia64-linux ~x86-linux ~x86-fbsd ~x86-macos" |
| 12 |
|
12 |
|
| 13 |
# NOTE: Portage doesn't support setting PROVIDE based on the USE flags |
13 |
# NOTE: Portage doesn't support setting PROVIDE based on the USE flags |
| 14 |
# that have been enabled, so we have to PROVIDE everything for now |
14 |
# that have been enabled, so we have to PROVIDE everything for now |
|
Lines 225-231
Link Here
|
| 225 |
fi |
225 |
fi |
| 226 |
|
226 |
|
| 227 |
if [[ ${build_apache2} = 1 ]] ; then |
227 |
if [[ ${build_apache2} = 1 ]] ; then |
| 228 |
my_conf="${my_conf} --with-apxs2=/usr/sbin/apxs2" |
228 |
my_conf="${my_conf} --with-apxs2=\"${EPREFIX}/usr/sbin/apxs2\"" |
| 229 |
|
229 |
|
| 230 |
# Threaded Apache2 support |
230 |
# Threaded Apache2 support |
| 231 |
if use threads ; then |
231 |
if use threads ; then |
|
Lines 337-343
Link Here
|
| 337 |
cp sapi/cgi/php-cgi php-cgi || die "Unable to copy CGI SAPI" |
337 |
cp sapi/cgi/php-cgi php-cgi || die "Unable to copy CGI SAPI" |
| 338 |
;; |
338 |
;; |
| 339 |
apache2) |
339 |
apache2) |
| 340 |
my_conf="${my_conf} --disable-cli --with-apxs2=/usr/sbin/apxs2" |
340 |
my_conf="${my_conf} --disable-cli --with-apxs2=${EPREFIX}/usr/sbin/apxs2" |
| 341 |
php5_2-sapi_src_compile |
341 |
php5_2-sapi_src_compile |
| 342 |
;; |
342 |
;; |
| 343 |
esac |
343 |
esac |
|
Lines 350-356
Link Here
|
| 350 |
src_install() { |
350 |
src_install() { |
| 351 |
php_determine_sapis |
351 |
php_determine_sapis |
| 352 |
|
352 |
|
| 353 |
destdir=/usr/$(get_libdir)/php5 |
353 |
destdir="${EPREFIX}/usr/$(get_libdir)/php5" |
| 354 |
|
354 |
|
| 355 |
# Let the eclass do the common work |
355 |
# Let the eclass do the common work |
| 356 |
php5_2-sapi_src_install |
356 |
php5_2-sapi_src_install |
|
Lines 441-448
Link Here
|
| 441 |
php-select php php5 |
441 |
php-select php php5 |
| 442 |
elif [[ ${exitStatus} == 4 ]] ; then |
442 |
elif [[ ${exitStatus} == 4 ]] ; then |
| 443 |
ewarn |
443 |
ewarn |
| 444 |
ewarn "/usr/bin/php links to a different version of PHP." |
444 |
ewarn "${EPREFIX}/usr/bin/php links to a different version of PHP." |
| 445 |
ewarn "To make /usr/bin/php point to PHP v5, use php-select:" |
445 |
ewarn "To make ${EPREFIX}/usr/bin/php point to PHP v5, use php-select:" |
| 446 |
ewarn |
446 |
ewarn |
| 447 |
ewarn " php-select php php5" |
447 |
ewarn " php-select php php5" |
| 448 |
ewarn |
448 |
ewarn |
|
Lines 457-464
Link Here
|
| 457 |
php-select php-cgi php5 |
457 |
php-select php-cgi php5 |
| 458 |
elif [[ ${exitStatus} == 4 ]] ; then |
458 |
elif [[ ${exitStatus} == 4 ]] ; then |
| 459 |
ewarn |
459 |
ewarn |
| 460 |
ewarn "/usr/bin/php-cgi links to a different version of PHP." |
460 |
ewarn "${EPREFIX}/usr/bin/php-cgi links to a different version of PHP." |
| 461 |
ewarn "To make /usr/bin/php-cgi point to PHP v5, use php-select:" |
461 |
ewarn "To make ${EPREFIX}/usr/bin/php-cgi point to PHP v5, use php-select:" |
| 462 |
ewarn |
462 |
ewarn |
| 463 |
ewarn " php-select php-cgi php5" |
463 |
ewarn " php-select php-cgi php5" |
| 464 |
ewarn |
464 |
ewarn |
|
Lines 472-478
Link Here
|
| 472 |
php-select php-devel php5 |
472 |
php-select php-devel php5 |
| 473 |
elif [[ $exitStatus == 4 ]] ; then |
473 |
elif [[ $exitStatus == 4 ]] ; then |
| 474 |
ewarn |
474 |
ewarn |
| 475 |
ewarn "/usr/bin/php-config and/or /usr/bin/phpize are linked to a" |
475 |
ewarn "${EPREFIX}/usr/bin/php-config and/or ${EPREFIX}/usr/bin/phpize are linked to a" |
| 476 |
ewarn "different version of PHP. To make them point to PHP v5, use" |
476 |
ewarn "different version of PHP. To make them point to PHP v5, use" |
| 477 |
ewarn "php-select:" |
477 |
ewarn "php-select:" |
| 478 |
ewarn |
478 |
ewarn |
