aboutsummaryrefslogtreecommitdiff
path: root/meta-linaro/recipes-devtools/php/php/fix-fpm-cross-compile.patch
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2013-04-16 14:44:04 +0200
committerMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2013-04-16 14:44:04 +0200
commit77136c0226dae81c37e81214f938f949faec377a (patch)
treeea70a527cc3539470161a82e0af66a026603179b /meta-linaro/recipes-devtools/php/php/fix-fpm-cross-compile.patch
parent72527ff1732892788380b3c55c0614d962cbe05a (diff)
downloadmeta-linaro-77136c0226dae81c37e81214f938f949faec377a.tar.gz
php: updated to 5.4.14 (sent to OE)
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Diffstat (limited to 'meta-linaro/recipes-devtools/php/php/fix-fpm-cross-compile.patch')
-rw-r--r--meta-linaro/recipes-devtools/php/php/fix-fpm-cross-compile.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/meta-linaro/recipes-devtools/php/php/fix-fpm-cross-compile.patch b/meta-linaro/recipes-devtools/php/php/fix-fpm-cross-compile.patch
new file mode 100644
index 00000000..b009347a
--- /dev/null
+++ b/meta-linaro/recipes-devtools/php/php/fix-fpm-cross-compile.patch
@@ -0,0 +1,38 @@
+From 0b44f16ea2f18a08eb1249db6621840527eab5e0 Mon Sep 17 00:00:00 2001
+From: Jerome Loyet <fat@php.net>
+Date: Wed, 23 May 2012 11:40:22 +0200
+Subject: [PATCH] - Fixed bug #61839 (Unable to cross-compile PHP with
+ --enable-fpm)
+
+---
+Upstream-Status: Applied
+http://git.php.net/?p=php-src.git;a=commit;h=0b44f16ea2f18a08eb1249db6621840527eab5e0
+
+ NEWS | 1 +
+ sapi/fpm/config.m4 | 4 ++++
+ 2 files changed, 5 insertions(+)
+
+diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4
+index 8962810..6c860c9 100644
+--- a/sapi/fpm/config.m4
++++ b/sapi/fpm/config.m4
+@@ -192,6 +192,8 @@ AC_DEFUN([AC_FPM_TRACE],
+ have_ptrace=no
+ have_broken_ptrace=yes
+ AC_MSG_RESULT([no])
++ ], [
++ AC_MSG_RESULT([skipped (cross compiling)])
+ ])
+ fi
+
+@@ -264,6 +266,8 @@ AC_DEFUN([AC_FPM_TRACE],
+ ], [
+ proc_mem_file=""
+ AC_MSG_RESULT([no])
++ ], [
++ AC_MSG_RESULT([skipped (cross compiling)])
+ ])
+ fi
+
+--
+1.7.11.5