diff options
Diffstat (limited to '88.patch')
| -rw-r--r-- | 88.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/88.patch b/88.patch new file mode 100644 index 0000000..9dd01d7 --- /dev/null +++ b/88.patch @@ -0,0 +1,25 @@ +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'), |