1From eab5babdadea487bbbef025068c553f5ba741774 Mon Sep 17 00:00:00 2001 2From: Claude Bing <cbing@cybernetics.com> 3Date: Tue, 9 Nov 2021 13:07:25 -0500 4Subject: [PATCH 06/11] ext/phar/Makefile.frag: Fix phar packaging 5 6Inherited from OE-Classic, with some additions to fix host paths leaking 7into the target package. 8 9Upstream-Status: Inappropriate [config] 10 11update patch to version 7.4.4 12Signed-off-by: Changqing Li <changqing.li@windriver.com> 13Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> 14 15update patch to version 8.0.12 16Signed-off-by: Claude Bing <cbing@cybernetics.com> 17--- 18 ext/phar/Makefile.frag | 17 +++-------------- 19 1 file changed, 3 insertions(+), 14 deletions(-) 20 21diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag 22index 58789cae25..c02af1b186 100644 23--- a/ext/phar/Makefile.frag 24+++ b/ext/phar/Makefile.frag 25@@ -10,20 +10,9 @@ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar 26 27 PHP_PHARCMD_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0 28 PHP_PHARCMD_EXECUTABLE = ` \ 29- if test -x "$(top_builddir)/$(SAPI_CLI_PATH)"; then \ 30- $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \ 31- if test "x$(PHP_MODULES)" != "x"; then \ 32- $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \ 33- for i in bz2 zlib phar; do \ 34- if test -f "$(top_builddir)/modules/$$i.la"; then \ 35- . $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \ 36- fi; \ 37- done; \ 38- fi; \ 39- else \ 40- $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \ 41- fi;` 42-PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";` 43+ $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; ` 44+ 45+PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";` 46 47 $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc 48 -@test -d $(builddir)/phar || mkdir $(builddir)/phar 49-- 502.25.1 51 52