aboutsummaryrefslogtreecommitdiff
path: root/meta-linaro/recipes-devtools/php/php/fix-fpm-cross-compile.patch
blob: b009347a21aafb02ce7a6fe531a0e9975ea27607 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
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