mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-09-05 01:32:57 +00:00
6ca753cbe6
0001-ext-opcache-config.m4-enable-opcache.patch is dropped. This patch could be dropped because the new version now uses AC_CACHE_CHECK, and we can just pass ac_cv_xxx to it instead of using a local patch. 0008-ext-imap-config.m4-fix-include-paths.patch is dropped. ext/imap has been removed from php in this new version. See https://github.com/php/php-src/pull/13190. As a result of this removal, the corresponding PACKAGECONFIG is removed from this new version. 0001-Change-whether-to-inline-XXH3_hashLong_withSecret-to.patch is dropped. It has been merged in this new version. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
52 lines
2.0 KiB
Diff
52 lines
2.0 KiB
Diff
From f7724d7ccd157058630e6a887798ab6d3e34c6b7 Mon Sep 17 00:00:00 2001
|
|
From: Claude Bing <cbing@cybernetics.com>
|
|
Date: Tue, 9 Nov 2021 13:07:25 -0500
|
|
Subject: [PATCH 2/5] 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(-)
|
|
|
|
diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag
|
|
index cedde76df..09d577d73 100644
|
|
--- a/ext/phar/Makefile.frag
|
|
+++ b/ext/phar/Makefile.frag
|
|
@@ -10,20 +10,9 @@ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar
|
|
|
|
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
|
|
--
|
|
2.25.1
|
|
|