Commit | Line | Data |
---|---|---|
da1533a4 FF |
1 | diff -u -r ../php-7.1.0RC3/ext/phar/Makefile.frag ./ext/phar/Makefile.frag |
2 | --- ../php-7.1.0RC3/ext/phar/Makefile.frag 2016-09-28 22:15:43.000000000 -0400 | |
3 | +++ ./ext/phar/Makefile.frag 2016-10-03 05:47:53.106218451 -0400 | |
e339be42 FF |
4 | @@ -4,20 +4,7 @@ |
5 | pharcmd: $(builddir)/phar.php $(builddir)/phar.phar | |
6 | ||
da1533a4 | 7 | PHP_PHARCMD_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0 -d 'safe_mode=0' |
e339be42 FF |
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 |