com php-src: pear 1.10 was released and the go-pear and install pear phars are now php7 compatible: makedist pear/Makefile.frag win32/build/mkdist.php
| From: | Ferenc Kovacs | Date: | Wed, 07 Oct 2015 11:56:47 +0000 |
| Subject: | com php-src: pear 1.10 was released and the go-pear and install pear phars are now php7 compatible: makedist pear/Makefile.frag win32/build/mkdist.php | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89327@lists.php.net to get a copy of this message | ||
Commit: f9e3461c02068c599ea9fbf6455860c8cc956bc6
Author: Ferenc Kovacs <tyrael@php.net> Wed, 7 Oct 2015 13:56:47 +0200
Parents: 5d2813edceaf24664388ac301adc885e147606a3
Branches: PHP-7.0
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f9e3461c02068c599ea9fbf6455860c8cc956bc6
Log:
pear 1.10 was released and the go-pear and install pear phars are now php7 compatible
Changed paths:
M makedist
M pear/Makefile.frag
M win32/build/mkdist.php
Diff:
diff --git a/makedist b/makedist
index 50cb49e..5b28dd8 100755
--- a/makedist
+++ b/makedist
@@ -118,7 +118,7 @@ sed -i 's,^#ifndef YYTOKENTYPE,#include "zend.h"\n#ifndef
YYTOKENTYPE,g' $MY_OLD
# download pear
$ECHO_N "makedist: Attempting to download PEAR's phar archive"
if test ! -x wget; then
- wget https://pear.php.net/~cweiske/1.10.0dev2/install-pear-nozlib.phar
-nd -P pear/
+ wget https://pear.php.net/install-pear-nozlib.phar
-nd -P pear/
else
$ECHO_N "Missing wget binary needed for pear download";
exit 7
diff --git a/pear/Makefile.frag b/pear/Makefile.frag
index 4cb7bc9..bbe8ec3 100644
--- a/pear/Makefile.frag
+++ b/pear/Makefile.frag
@@ -9,7 +9,7 @@ WGET =
which wget 2>/dev/null
FETCH = which fetch 2>/dev/null
PEAR_PREFIX = -dp a${program_prefix}
PEAR_SUFFIX = -ds a$(program_suffix)
-PEAR_INSTALLER_URL = https://pear.php.net/~cweiske/1.10.0dev2/install-pear-nozlib.phar
+PEAR_INSTALLER_URL = https://pear.php.net/install-pear-nozlib.phar
install-pear-installer: $(SAPI_CLI_PATH)
@$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d
"$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
diff --git a/win32/build/mkdist.php b/win32/build/mkdist.php
index c379398..ca99b0d 100644
--- a/win32/build/mkdist.php
+++ b/win32/build/mkdist.php
@@ -498,7 +498,7 @@ if (!$use_pear_template) {
/* grab the bootstrap script */
echo "Downloading go-pear\n";
- copy("https://pear.php.net/~cweiske/1.10.0dev2/go-pear.phar",
"$dist_dir/PEAR/go-pear.php");
+ copy("https://pear.php..net/go-pear.phar",
"$dist_dir/PEAR/go-pear.php");
/* import the package list -- sets $packages variable */
include "pear/go-pear-list..php";