| 1 | diff -u -r ../php-5.6.16/ext/phar/Makefile.frag ./ext/phar/Makefile.frag |
| 2 | --- ../php-5.6.16/ext/phar/Makefile.frag 2015-11-25 15:28:38.000000000 -0500 |
| 3 | +++ ./ext/phar/Makefile.frag 2015-12-22 05:31:09.794496317 -0500 |
| 4 | @@ -4,20 +4,7 @@ |
| 5 | pharcmd: $(builddir)/phar.php $(builddir)/phar.phar |
| 6 | |
| 7 | PHP_PHARCMD_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0 -d 'safe_mode=0' |
| 8 | -PHP_PHARCMD_EXECUTABLE = ` \ |
| 9 | - if test -x "$(top_builddir)/$(SAPI_CLI_PATH)"; then \ |
| 10 | - $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \ |
| 11 | - if test "x$(PHP_MODULES)" != "x"; then \ |
| 12 | - $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \ |
| 13 | - for i in bz2 zlib phar; do \ |
| 14 | - if test -f "$(top_builddir)/modules/$$i.la"; then \ |
| 15 | - . $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \ |
| 16 | - fi; \ |
| 17 | - done; \ |
| 18 | - fi; \ |
| 19 | - else \ |
| 20 | - $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \ |
| 21 | - fi;` |
| 22 | +PHP_PHARCMD_EXECUTABLE = $(NATIVE_PHP_EXECUTABLE) |
| 23 | PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";` |
| 24 | |
| 25 | $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc |