You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
26 lines
1.2 KiB
26 lines
1.2 KiB
9 years ago
|
diff -u -r ../php-5.6.16/ext/phar/Makefile.frag ./ext/phar/Makefile.frag
|
||
|
|
--- ../php-5.6.16/ext/phar/Makefile.frag 2015-11-25 15:28:38.000000000 -0500
|
||
|
|
+++ ./ext/phar/Makefile.frag 2015-12-22 05:31:09.794496317 -0500
|
||
|
|
@@ -4,20 +4,7 @@
|
||
|
|
pharcmd: $(builddir)/phar.php $(builddir)/phar.phar
|
||
|
|
|
||
|
|
PHP_PHARCMD_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0 -d 'safe_mode=0'
|
||
|
|
-PHP_PHARCMD_EXECUTABLE = ` \
|
||
|
|
- if test -x "$(top_builddir)/$(SAPI_CLI_PATH)"; then \
|
||
|
|
- $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \
|
||
|
|
- if test "x$(PHP_MODULES)" != "x"; then \
|
||
|
|
- $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \
|
||
|
|
- for i in bz2 zlib phar; do \
|
||
|
|
- if test -f "$(top_builddir)/modules/$$i.la"; then \
|
||
|
|
- . $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
|
||
|
|
- fi; \
|
||
|
|
- done; \
|
||
|
|
- fi; \
|
||
|
|
- else \
|
||
|
|
- $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \
|
||
|
|
- fi;`
|
||
|
|
+PHP_PHARCMD_EXECUTABLE = $(NATIVE_PHP_EXECUTABLE)
|
||
|
|
PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";`
|
||
|
|
|
||
|
|
$(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc
|