Skip to content

Commit f9e3461

Browse files
committed
pear 1.10 was released and the go-pear and install pear phars are now php7 compatible
1 parent 5d2813e commit f9e3461

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

makedist

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ sed -i 's,^#ifndef YYTOKENTYPE,#include "zend.h"\n#ifndef YYTOKENTYPE,g' $MY_OLD
118118
# download pear
119119
$ECHO_N "makedist: Attempting to download PEAR's phar archive"
120120
if test ! -x wget; then
121-
wget https://pear.php.net/~cweiske/1.10.0dev2/install-pear-nozlib.phar -nd -P pear/
121+
wget https://pear.php.net/install-pear-nozlib.phar -nd -P pear/
122122
else
123123
$ECHO_N "Missing wget binary needed for pear download";
124124
exit 7

pear/Makefile.frag

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ WGET = `which wget 2>/dev/null`
99
FETCH = `which fetch 2>/dev/null`
1010
PEAR_PREFIX = -dp a${program_prefix}
1111
PEAR_SUFFIX = -ds a$(program_suffix)
12-
PEAR_INSTALLER_URL = https://pear.php.net/~cweiske/1.10.0dev2/install-pear-nozlib.phar
12+
PEAR_INSTALLER_URL = https://pear.php.net/install-pear-nozlib.phar
1313

1414
install-pear-installer: $(SAPI_CLI_PATH)
1515
@$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}

win32/build/mkdist.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ function make_phar_dot_phar($dist_dir)
498498

499499
/* grab the bootstrap script */
500500
echo "Downloading go-pear\n";
501-
copy("https://pear.php.net/~cweiske/1.10.0dev2/go-pear.phar", "$dist_dir/PEAR/go-pear.php");
501+
copy("https://pear.php.net/go-pear.phar", "$dist_dir/PEAR/go-pear.php");
502502

503503
/* import the package list -- sets $packages variable */
504504
include "pear/go-pear-list.php";

0 commit comments

Comments
 (0)