mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-05 00:37:29 +00:00
Anuj Mittal
1816eb7779
For changes, see: http://php.net/ChangeLog-5.php#5.6.35 Split patches between php5 and php7 to ensure there are no fuzz warnings for both the versions. Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
47 lines
1.8 KiB
Diff
47 lines
1.8 KiB
Diff
From 3ea626a8d081f56b01004b7992534d4e6b81a9cc Mon Sep 17 00:00:00 2001
|
|
From: Koen Kooi <koen@dominion.thruhere.net>
|
|
Date: Wed, 2 Nov 2011 16:54:57 +0100
|
|
Subject: [PATCH] Fix phar packaging
|
|
|
|
Inherited from OE-Classic, with some additions to fix host paths leaking
|
|
into the target package.
|
|
|
|
Upstream-Status: Inappropriate [config]
|
|
|
|
%% original patch: php5-phar-makefile.patch
|
|
---
|
|
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 b8b1b42..1005b2d 100644
|
|
--- a/ext/phar/Makefile.frag
|
|
+++ b/ext/phar/Makefile.frag
|
|
@@ -5,20 +5,9 @@ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar
|
|
|
|
PHP_PHARCMD_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0 -d 'safe_mode=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 -- "$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";`
|
|
|
|
$(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc
|
|
-@test -d $(builddir)/phar || mkdir $(builddir)/phar
|
|
--
|
|
2.7.4
|
|
|