| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 1 | From eab5babdadea487bbbef025068c553f5ba741774 Mon Sep 17 00:00:00 2001 |
| 2 | From: Claude Bing <cbing@cybernetics.com> |
| 3 | Date: Tue, 9 Nov 2021 13:07:25 -0500 |
| 4 | Subject: [PATCH 06/11] ext/phar/Makefile.frag: Fix phar packaging |
| 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 | |
| 11 | update patch to version 7.4.4 |
| 12 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
| 13 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> |
| 14 | |
| 15 | update patch to version 8.0.12 |
| 16 | Signed-off-by: Claude Bing <cbing@cybernetics.com> |
| 17 | --- |
| 18 | ext/phar/Makefile.frag | 17 +++-------------- |
| 19 | 1 file changed, 3 insertions(+), 14 deletions(-) |
| 20 | |
| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 21 | --- a/ext/phar/Makefile.frag |
| 22 | +++ b/ext/phar/Makefile.frag |
| Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame^] | 23 | @@ -10,20 +10,9 @@ pharcmd: $(builddir)/phar.php $(builddir |
| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 24 | |
| 25 | PHP_PHARCMD_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0 |
| 26 | PHP_PHARCMD_EXECUTABLE = ` \ |
| 27 | - if test -x "$(top_builddir)/$(SAPI_CLI_PATH)"; then \ |
| 28 | - $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \ |
| 29 | - if test "x$(PHP_MODULES)" != "x"; then \ |
| 30 | - $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \ |
| 31 | - for i in bz2 zlib phar; do \ |
| 32 | - if test -f "$(top_builddir)/modules/$$i.la"; then \ |
| 33 | - . $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \ |
| 34 | - fi; \ |
| 35 | - done; \ |
| 36 | - fi; \ |
| 37 | - else \ |
| 38 | - $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \ |
| 39 | - fi;` |
| 40 | -PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";` |
| 41 | + $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; ` |
| 42 | + |
| Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame^] | 43 | +PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "/usr/bin/env $(program_prefix)php$(program_suffix)$(EXEEXT)";` |
| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 44 | |
| 45 | $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc |
| 46 | -@test -d $(builddir)/phar || mkdir $(builddir)/phar |