Skip to content

Persist the pear/install-pear-nozlib.phar file #23634

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DanielEScherzer wants to merge 2 commits into
base: PHP-8.2
Choose a base branch
from
Open

Persist the pear/install-pear-nozlib.phar file #23634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1da5fd7
Update PEAR failed download installation banner (#14216)
petk May 13, 2024
0625d26
Persist the `pear/install-pear-nozlib.phar` file
DanielEScherzer Sep 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,6 @@

# The OSS fuzz files are bunary
/ext/date/tests/ossfuzz*.txt binary

# The phar has some binary
/pear/install-pear-nozlib.phar binary
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ config.h.in
# ------------------------------------------------------------------------------
/ext/phar/phar.phar
/ext/phar/phar.php
/pear/install-pear-nozlib.phar
/sapi/cgi/php-cgi
/sapi/fpm/php-fpm
/sapi/phpdbg/phpdbg
Expand Down
15 changes: 1 addition & 14 deletions pear/Makefile.frag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,16 @@ peardir=$(PEAR_INSTALLDIR)
# Skip all php.ini files altogether
PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dopen_basedir= -derror_reporting=1803 -dmemory_limit=-1 -ddetect_unicode=0

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/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}

install-pear:
@echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/"
@if test ! -f $(builddir)/install-pear-nozlib.phar; then \
if test -f $(srcdir)/install-pear-nozlib.phar; then \
cp $(srcdir)/install-pear-nozlib.phar $(builddir)/install-pear-nozlib.phar; \
else \
if test ! -z "$(WGET)" && test -x "$(WGET)"; then \
"$(WGET)" "${PEAR_INSTALLER_URL}" -nd -P $(builddir)/; \
elif test ! -z "$(FETCH)" && test -x "$(FETCH)"; then \
"$(FETCH)" -o $(builddir)/ "${PEAR_INSTALLER_URL}"; \
else \
$(top_builddir)/sapi/cli/php -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \
fi \
fi \
cp $(srcdir)/install-pear-nozlib.phar $(builddir)/install-pear-nozlib.phar; \
fi
@if test -f $(builddir)/install-pear-nozlib.phar && $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \
$(MAKE) -s install-pear-installer; \
Expand Down
74 changes: 0 additions & 74 deletions pear/fetch.php
View file
Open in desktop

This file was deleted.

Loading
Loading