diff options
| author |   Koen Kooi <koen.kooi@linaro.org> | 2014-10-06 11:55:01 +0200 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2014-10-10 12:47:34 +0200 |
| commit | 4deb828fff69b2c04837b122676aa9d4f56c1b9e (patch) | |
| tree | 146fbc0b1347fe646109e59ad853d75a76530b69 /meta-oe/recipes-devtools/php/php/phar-makefile.patch | |
| parent | 26043cbe2d9add3ab1f6464e647d04f0e077aede (diff) | |
| download | meta-openembedded-contrib-4deb828fff69b2c04837b122676aa9d4f56c1b9e.tar.gz | |
php: update to 5.4.33
One patch was a backport and can be dropped, add Upstream-status to the others.
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/php/php/phar-makefile.patch')
| -rw-r--r-- | meta-oe/recipes-devtools/php/php/phar-makefile.patch | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/meta-oe/recipes-devtools/php/php/phar-makefile.patch b/meta-oe/recipes-devtools/php/php/phar-makefile.patch index 6fde251275..8a1136da51 100644 --- a/meta-oe/recipes-devtools/php/php/phar-makefile.patch +++ b/meta-oe/recipes-devtools/php/php/phar-makefile.patch @@ -1,8 +1,12 @@ +Upstream-status: Unknown + diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag -index fc93d1d..9a8cd65 100755 +old mode 100644 +new mode 100755 +index ed6de9f..9d03198 --- a/ext/phar/Makefile.frag +++ b/ext/phar/Makefile.frag -@@ -6,19 +6,8 @@ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar +@@ -5,19 +5,8 @@ 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 = ` \ @@ -24,3 +28,6 @@ index fc93d1d..9a8cd65 100755 PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";` $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc +-- +1.9.3 + |