mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-09-03 11:18:04 +00:00
02c7c9adab
This patch is not only needed for target but also needed for native and nativesdk variants. Fixes do_populate_sysroot: QA Issue: : /work/x86_64-linux/php-native/8.1.7-r0/sysroot-destdir/ work/x86_64-linux/php-native/8.1.7-r0/recipe-sysroot-native/usr/bin/phar.phar maximum shebang size exceeded, the ma ximum size is 128. [shebang-size] Signed-off-by: Khem Raj <raj.khem@gmail.com>
47 lines
1.9 KiB
Diff
47 lines
1.9 KiB
Diff
From eab5babdadea487bbbef025068c553f5ba741774 Mon Sep 17 00:00:00 2001
|
|
From: Claude Bing <cbing@cybernetics.com>
|
|
Date: Tue, 9 Nov 2021 13:07:25 -0500
|
|
Subject: [PATCH 06/11] ext/phar/Makefile.frag: Fix phar packaging
|
|
|
|
Inherited from OE-Classic, with some additions to fix host paths leaking
|
|
into the target package.
|
|
|
|
Upstream-Status: Inappropriate [config]
|
|
|
|
update patch to version 7.4.4
|
|
Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
|
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
|
|
|
update patch to version 8.0.12
|
|
Signed-off-by: Claude Bing <cbing@cybernetics.com>
|
|
---
|
|
ext/phar/Makefile.frag | 17 +++--------------
|
|
1 file changed, 3 insertions(+), 14 deletions(-)
|
|
|
|
--- a/ext/phar/Makefile.frag
|
|
+++ b/ext/phar/Makefile.frag
|
|
@@ -10,20 +10,9 @@ pharcmd: $(builddir)/phar.php $(builddir
|
|
|
|
PHP_PHARCMD_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=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_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";`
|
|
+ $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; `
|
|
+
|
|
+PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "/usr/bin/env $(program_prefix)php$(program_suffix)$(EXEEXT)";`
|
|
|
|
$(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc
|
|
-@test -d $(builddir)/phar || mkdir $(builddir)/phar
|