cvs: php-src(PHP_5_1) /pear Makefile.frag
| From: | Greg Beaver | Date: | Wed, 08 Feb 2006 01:12:13 +0000 |
| Subject: | cvs: php-src(PHP_5_1) /pear Makefile.frag | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-36825@lists.php.net to get a copy of this message | ||
cellog Wed Feb 8 01:12:13 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/pear Makefile.frag
Log:
MFB fix Bug #36001: make install fails when --enable-memory-limit used
http://cvs.php.net/viewcvs.cgi/php-src/pear/Makefile.frag?r1=1.35.6.9&r2=1.35.6.10&diff_format=u
Index: php-src/pear/Makefile.frag
diff -u php-src/pear/Makefile.frag:1.35.6.9 php-src/pear/Makefile.frag:1.35.6.10
--- php-src/pear/Makefile.frag:1.35.6.9 Mon Dec 12 12:39:50 2005
+++ php-src/pear/Makefile.frag Wed Feb 8 01:12:12 2006
@@ -3,7 +3,7 @@
peardir=$(PEAR_INSTALLDIR)
# Skip all php.ini files altogether
-PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -derror_reporting=E_ALL -ddetect_unicode=0
+PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -derror_reporting=E_ALL -dmemory_limit=-1
-ddetect_unicode=0
install-pear-installer: $(SAPI_CLI_PATH)
@$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d
"$(peardir)" -b "$(bindir)"