| 1 |
mabi 11/10/31 16:18:04 |
| 2 |
|
| 3 |
Modified: src_install-v3.eblit |
| 4 |
Added: src_compile-v2.eblit |
| 5 |
Log: |
| 6 |
Simplify src_compile and grab binaries/apache modules directly from sapis-build directory, circumventing make install-sapi to fix bug #351266 |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha72/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.4 dev-lang/php/files/eblits/src_install-v3.eblit |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v3.eblit?rev=1.4&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v3.eblit?rev=1.4&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v3.eblit?r1=1.3&r2=1.4 |
| 16 |
|
| 17 |
Index: src_install-v3.eblit |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v3.eblit,v |
| 20 |
retrieving revision 1.3 |
| 21 |
retrieving revision 1.4 |
| 22 |
diff -u -r1.3 -r1.4 |
| 23 |
--- src_install-v3.eblit 16 Sep 2011 07:02:57 -0000 1.3 |
| 24 |
+++ src_install-v3.eblit 31 Oct 2011 16:18:04 -0000 1.4 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
# Copyright 1999-2011 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v3.eblit,v 1.3 2011/09/16 07:02:57 olemarkus Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v3.eblit,v 1.4 2011/10/31 16:18:04 mabi Exp $ |
| 30 |
|
| 31 |
eblit-php-src_install() { |
| 32 |
# see bug #324739 for what happens when we don't have that |
| 33 |
@@ -36,20 +36,39 @@ |
| 34 |
if use "${sapi}" ; then |
| 35 |
einfo "Installing SAPI: ${sapi}" |
| 36 |
cd "${WORKDIR}/sapis-build/${sapi}" |
| 37 |
- # needed each time, php_install_ini would reset it |
| 38 |
- into "${PHP_DESTDIR}" |
| 39 |
- file=$(find "${SAPI_DIR}/${sapi}/" -type f | head -n 1) |
| 40 |
- |
| 41 |
- if [[ "${file: -3}" == ".so" ]]; then |
| 42 |
- if [[ "${sapi}" == "apache2" ]]; then |
| 43 |
- insinto "${PHP_DESTDIR}/apache2/" |
| 44 |
- newins "${file}" "${file/*\/}" |
| 45 |
- keepdir "/usr/$(get_libdir)/apache2/modules" |
| 46 |
+ |
| 47 |
+ if [[ "${sapi}" == "apache2" ]] ; then |
| 48 |
+ # We're specifically not using emake install-sapi as libtool |
| 49 |
+ # may cause unnecessary relink failures (see bug #351266) |
| 50 |
+ insinto "${PHP_DESTDIR}/apache2/" |
| 51 |
+ newins ".libs/libphp5.so" "libphp${PHP_MV}.so" |
| 52 |
+ keepdir "/usr/$(get_libdir)/apache2/modules" |
| 53 |
+ else |
| 54 |
+ # needed each time, php_install_ini would reset it |
| 55 |
+ into "${PHP_DESTDIR}" |
| 56 |
+ case "$sapi" in |
| 57 |
+ cli) |
| 58 |
+ source="sapi/cli/php" |
| 59 |
+ ;; |
| 60 |
+ cgi) |
| 61 |
+ source="sapi/cgi/php-cgi" |
| 62 |
+ ;; |
| 63 |
+ fpm) |
| 64 |
+ source="sapi/fpm/php-fpm" |
| 65 |
+ ;; |
| 66 |
+ embed) |
| 67 |
+ source="libs/libphp${PHP_MV}.so" |
| 68 |
+ ;; |
| 69 |
+ *) |
| 70 |
+ die "unhandled sapi in src_install" |
| 71 |
+ ;; |
| 72 |
+ esac |
| 73 |
+ |
| 74 |
+ if [[ "${source: -3}" == ".so" ]]; then |
| 75 |
+ dolib.so "${source}" || die "Unable to install ${sapi} sapi" |
| 76 |
else |
| 77 |
- dolib.so "${file}" || die "Unable to install ${sapi} sapi" |
| 78 |
+ dobin "${source}" || die "Unable to install ${sapi} sapi" |
| 79 |
fi |
| 80 |
- else |
| 81 |
- dobin "${file}" || die "Unable to install ${sapi} sapi" |
| 82 |
fi |
| 83 |
|
| 84 |
php_install_ini "${sapi}" |
| 85 |
@@ -57,7 +76,7 @@ |
| 86 |
# construct correct SAPI string for php-config |
| 87 |
# thanks to ferringb for the bash voodoo |
| 88 |
if [[ "${sapi}" == "apache2" ]]; then |
| 89 |
- sapi_list="${sapi_list:+${sapi_list} }apache2handler" |
| 90 |
+ sapi_list="${sapi_list:+${sapi_list} }apache2handler" |
| 91 |
else |
| 92 |
sapi_list="${sapi_list:+${sapi_list} }${sapi}" |
| 93 |
fi |
| 94 |
|
| 95 |
|
| 96 |
|
| 97 |
1.3 dev-lang/php/files/eblits/src_compile-v2.eblit |
| 98 |
|
| 99 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_compile-v2.eblit?rev=1.3&view=markup |
| 100 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_compile-v2.eblit?rev=1.3&content-type=text/plain |
| 101 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_compile-v2.eblit?r1=1.2&r2=1.3 |
Archives