| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | Fix phar packaging |
| 2 | |
| 3 | Inherited from OE-Classic, with some additions to fix host paths leaking |
| 4 | into the target package. |
| 5 | |
| 6 | Upstream-Status: Inappropriate [config] |
| 7 | |
| 8 | diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag |
| 9 | index 6516ddf..36e6cf4 100644 |
| 10 | --- a/ext/phar/Makefile.frag |
| 11 | +++ b/ext/phar/Makefile.frag |
| 12 | @@ -5,20 +5,9 @@ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar |
| 13 | |
| 14 | PHP_PHARCMD_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0 -d 'safe_mode=0' |
| 15 | PHP_PHARCMD_EXECUTABLE = ` \ |
| 16 | - if test -x "$(top_builddir)/$(SAPI_CLI_PATH)"; then \ |
| 17 | - $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \ |
| 18 | - if test "x$(PHP_MODULES)" != "x"; then \ |
| 19 | - $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \ |
| 20 | - for i in bz2 zlib phar; do \ |
| 21 | - if test -f "$(top_builddir)/modules/$$i.la"; then \ |
| 22 | - . $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \ |
| 23 | - fi; \ |
| 24 | - done; \ |
| 25 | - fi; \ |
| 26 | - else \ |
| 27 | - $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \ |
| 28 | - fi;` |
| 29 | -PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";` |
| 30 | + $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; ` |
| 31 | + |
| 32 | +PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";` |
| 33 | |
| 34 | $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc |
| 35 | -@test -d $(builddir)/phar || mkdir $(builddir)/phar |