From: Matti Bickel Date: Mon, 12 Jul 2010 17:48:32 +0000 (+0000) Subject: use peardev instead of pear to avoid memory limitation issues X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=0bc7420f269f89ad4744bea1bc330e250cac63cf;p=gentoo.git use peardev instead of pear to avoid memory limitation issues --- diff --git a/eclass/php-pear-lib-r1.eclass b/eclass/php-pear-lib-r1.eclass index 5c58dce0a537..d1947da81ee7 100644 --- a/eclass/php-pear-lib-r1.eclass +++ b/eclass/php-pear-lib-r1.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.16 2010/06/09 11:11:58 mabi Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.17 2010/07/12 17:48:32 mabi Exp $ # # Author: Luca Longinotti @@ -51,22 +51,22 @@ php-pear-lib-r1_src_install() { mv -f "${WORKDIR}/package2.xml" "${S}" if has_version '>=dev-php/PEAR-PEAR-1.7.0' ; then local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs" - pear -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \ + peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \ install --force --loose --nodeps --offline --packagingroot="${D}" \ "${S}/package2.xml" || die "Unable to install PEAR package" else - pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \ + peardev -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \ "${S}/package2.xml" || die "Unable to install PEAR package" fi else mv -f "${WORKDIR}/package.xml" "${S}" if has_version '>=dev-php/PEAR-PEAR-1.7.0' ; then local WWW_DIR="/usr/share/webapps/${PN}/${PVR}/htdocs" - pear -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \ + peardev -d php_bin="${PHP_BIN}" -d www_dir="${WWW_DIR}" \ install --force --loose --nodeps --offline --packagingroot="${D}" \ "${S}/package.xml" || die "Unable to install PEAR package" else - pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \ + peardev -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \ "${S}/package.xml" || die "Unable to install PEAR package" fi fi