From af09bbf07012af3f9d72ce85899db400aadaded4 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Thu, 12 Oct 2017 02:39:29 +0200 Subject: [PATCH] Fix bug #75346: PEAR install fails with shared xml PEAR installation requires to have xml and libxml extensions enabled. However when the xml extension is installed as shared one (--enable-xml=shared) the installation fails. This patch fixes this with additional ini entries passed to php cli command for installing PEAR. --- pear/Makefile.frag | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pear/Makefile.frag b/pear/Makefile.frag index bbe8ec351356c..546692b902171 100644 --- a/pear/Makefile.frag +++ b/pear/Makefile.frag @@ -2,8 +2,14 @@ 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 +# Skip all php.ini files altogether and add possible shared XML extension +PEAR_INSTALL_FLAGS = ` \ + echo -n -dshort_open_tag=0 -dopen_basedir= -derror_reporting=1803 -dmemory_limit=-1 -ddetect_unicode=0; \ + for i in $(CONFIGURE_COMMAND); do \ + if test "$$i" = "--enable-xml=shared"; then \ + echo " " -dextension_dir="$(top_builddir)/modules" -dextension=xml.$(SHLIB_DL_SUFFIX_NAME); \ + fi; \ + done` WGET = `which wget 2>/dev/null` FETCH = `which fetch 2>/dev/null` @@ -34,4 +40,3 @@ install-pear: else \ cat $(srcdir)/install-pear.txt; \ fi -