Commit:    0b44f16ea2f18a08eb1249db6621840527eab5e0
Author:    Jerome Loyet <f...@php.net>         Wed, 23 May 2012 11:40:22 +0200
Parents:   a07d76c0ba57e6471ac5869af0aaa26206baa284
Branches:  master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=0b44f16ea2f18a08eb1249db6621840527eab5e0

Log:
- Fixed bug #61839 (Unable to cross-compile PHP with --enable-fpm)

Bugs:
https://bugs.php.net/61839

Changed paths:
  M  NEWS
  M  sapi/fpm/config.m4


Diff:
diff --git a/NEWS b/NEWS
index c8aa208..9b0a3ac 100644
--- a/NEWS
+++ b/NEWS
@@ -59,6 +59,7 @@ PHP                                                           
             NEWS
   . Fixed bug #61835 (php-fpm is not allowed to run as root). (fat)
   . Fixed bug #61295 (php-fpm should not fail with commented 'user'
     for non-root start). (fat)
+  . Fixed bug #61839 (Unable to cross-compile PHP with --enable-fpm). (fat)
 
 - Libxml:
   . Fixed bug #61617 (Libxml tests failed(ht is already destroyed)).
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


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to