[packages/composer] hhvm peardir fix (PEAR_INSTALL_DIR constant is empty)

glen glen at pld-linux.org
Tue Aug 5 04:22:05 CEST 2014


commit fbddd7ded0941d2b079c53bf2b8cb6ba9410c913
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Aug 5 05:22:02 2014 +0300

    hhvm peardir fix (PEAR_INSTALL_DIR constant is empty)

 autoload-config.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/autoload-config.patch b/autoload-config.patch
index 58f047d..4e6b059 100644
--- a/autoload-config.patch
+++ b/autoload-config.patch
@@ -4,8 +4,8 @@
  
  $vendorDir = dirname(dirname(__FILE__));
  $baseDir = dirname($vendorDir);
-+$pearDir = PEAR_INSTALL_DIR . '/';
-+$phpDir = defined('PHP_DATADIR') ? PHP_DATADIR . '/php/' : '';
++$pearDir = defined('PEAR_INSTALL_DIR') && PEAR_INSTALL_DIR ? PEAR_INSTALL_DIR . '/' : '/usr/share/pear/';
++$phpDir = defined('PHP_DATADIR') && PHP_DATADIR ? PHP_DATADIR . '/php/' : '/usr/share/php';
  
  return array(
 +    'Symfony\\Component\\Process\\' => array($pearDir),
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/composer.git/commitdiff/fbddd7ded0941d2b079c53bf2b8cb6ba9410c913



More information about the pld-cvs-commit mailing list