summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatti Bickel <mabi@gentoo.org>2010-08-09 10:27:53 +0000
committerMatti Bickel <mabi@gentoo.org>2010-08-09 10:27:53 +0000
commit3ada2038bfe6eb60ebaed3a4dd385fe353e75779 (patch)
tree77bef036c69015d28c44afc4e63176013dd559b8 /dev-lang/php
parentx86 stable, bug 322791 (diff)
downloadgentoo-2-3ada2038bfe6eb60ebaed3a4dd385fe353e75779.tar.gz
gentoo-2-3ada2038bfe6eb60ebaed3a4dd385fe353e75779.tar.bz2
gentoo-2-3ada2038bfe6eb60ebaed3a4dd385fe353e75779.zip
bug #331735
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/php')
-rw-r--r--dev-lang/php/ChangeLog6
-rw-r--r--dev-lang/php/files/eblits/src_install-v1.eblit3
2 files changed, 7 insertions, 2 deletions
diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 783f9ac3a80d..43a2e5929834 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/php
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.402 2010/08/08 20:32:23 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.403 2010/08/09 10:27:53 mabi Exp $
+
+ 09 Aug 2010; Matti Bickel <mabi@gentoo.org>
+ files/eblits/src_install-v1.eblit:
+ cd to sapi dirs to make fpm config patches apply again (bug #331735)
*php-5.3.3-r1 (08 Aug 2010)
diff --git a/dev-lang/php/files/eblits/src_install-v1.eblit b/dev-lang/php/files/eblits/src_install-v1.eblit
index f0bcdb210289..ce3d578da685 100644
--- a/dev-lang/php/files/eblits/src_install-v1.eblit
+++ b/dev-lang/php/files/eblits/src_install-v1.eblit
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v1.eblit,v 1.7 2010/08/08 20:32:22 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v1.eblit,v 1.8 2010/08/09 10:27:53 mabi Exp $
eblit-php-src_install() {
# see bug #324739 for what happens when we don't have that
@@ -44,6 +44,7 @@ eblit-php-src_install() {
for sapi in ${SAPIS}; do
if use "${sapi}" ; then
einfo "Installing SAPI: ${sapi}"
+ cd "${WORKDIR}/sapis-build/${sapi}"
# needed each time, php_install_ini would reset it
into "${PHP_DESTDIR}"
file=$(find "${SAPI_DIR}/${sapi}/" -type f | head -n 1)