diff options
| author | Remi Collet <remi@remirepo.net> | 2019-03-14 07:27:49 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2019-03-14 07:27:49 +0100 |
| commit | 7c62749a2fbad48cff13fbf46444d7383684f91a (patch) | |
| tree | 2c9907b406df7768ca0506a8a29266b7ac30fc85 /88.patch | |
| parent | 2d942e1c1cabfe7b47974d6c4c9016bc318a925c (diff) | |
update PEAR to 1.10.8
drop patch merged upstream
Diffstat (limited to '88.patch')
| -rw-r--r-- | 88.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/88.patch b/88.patch deleted file mode 100644 index 9dd01d7..0000000 --- a/88.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 203b4a30289abf865123f2c23eb4edd4725a0dca Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Wed, 13 Mar 2019 16:15:56 +0100 -Subject: [PATCH] Only add bin_dir to PATH if not already there - -Fix https://bugs.php.net/75852 ---- - PEAR/Builder.php | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/PEAR/Builder.php b/PEAR/Builder.php -index 91348c726..eb5e90e72 100644 ---- a/PEAR/Builder.php -+++ b/PEAR/Builder.php -@@ -307,7 +307,9 @@ function build($descfile, $callback = null) - - $dir = getcwd(); - $this->log(2, "building in $dir"); -- putenv('PATH=' . $this->config->get('bin_dir') . ':' . getenv('PATH')); -+ if (!preg_match('@(^|:)' . $this->config->get('bin_dir') . '(:|$)@', getenv('PATH'))) { -+ putenv('PATH=' . $this->config->get('bin_dir') . ':' . getenv('PATH')); -+ } - $err = $this->_runCommand($this->config->get('php_prefix') - . "phpize" . - $this->config->get('php_suffix'), |