| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | From 08962a56f69963e01892d98ca5b75de8354bd3f5 Mon Sep 17 00:00:00 2001 |
| 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
| 3 | Date: Wed, 2 Nov 2011 16:54:57 +0100 |
| 4 | Subject: [PATCH] Fix phar packaging |
| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 5 | |
| 6 | Inherited from OE-Classic, with some additions to fix host paths leaking |
| 7 | into the target package. |
| 8 | |
| 9 | Upstream-Status: Inappropriate [config] |
| 10 | |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 11 | --- |
| 12 | ext/phar/Makefile.frag | 17 +++-------------- |
| 13 | 1 file changed, 3 insertions(+), 14 deletions(-) |
| 14 | |
| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 15 | diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 16 | index 0e3713f..22f7898 100644 |
| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 17 | --- a/ext/phar/Makefile.frag |
| 18 | +++ b/ext/phar/Makefile.frag |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 19 | @@ -10,20 +10,9 @@ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar |
| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 20 | |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 21 | PHP_PHARCMD_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0 -d 'safe_mode=0' |
| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 22 | PHP_PHARCMD_EXECUTABLE = ` \ |
| 23 | - if test -x "$(top_builddir)/$(SAPI_CLI_PATH)"; then \ |
| 24 | - $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \ |
| 25 | - if test "x$(PHP_MODULES)" != "x"; then \ |
| 26 | - $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \ |
| 27 | - for i in bz2 zlib phar; do \ |
| 28 | - if test -f "$(top_builddir)/modules/$$i.la"; then \ |
| 29 | - . $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \ |
| 30 | - fi; \ |
| 31 | - done; \ |
| 32 | - fi; \ |
| 33 | - else \ |
| 34 | - $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \ |
| 35 | - fi;` |
| 36 | -PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";` |
| 37 | + $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; ` |
| 38 | + |
| 39 | +PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";` |
| 40 | |
| 41 | $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc |
| 42 | -@test -d $(builddir)/phar || mkdir $(builddir)/phar |