package/php/0004-flock-type-linux.patch

   1 OPcache: flock mechanism is obviously linux so force it.
   2
   3 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
   4
   5 diff -Nura php-5.6.7.orig/ext/opcache/config.m4 php-5.6.7/ext/opcache/config.m4
   6 --- php-5.6.7.orig/ext/opcache/config.m4        2015-04-08 11:08:11.125845540 -0300
   7 +++ php-5.6.7/ext/opcache/config.m4     2015-04-08 11:57:23.648831436 -0300
   8 @@ -326,38 +326,8 @@
   9      msg=yes,msg=no,msg=no)
  10    AC_MSG_RESULT([$msg])
  11
  12 -flock_type=unknown
  13 -AC_MSG_CHECKING("whether flock struct is linux ordered")
  14 -AC_TRY_RUN([
  15 -  #include <fcntl.h>
  16 -  struct flock lock = { 1, 2, 3, 4, 5 };
  17 -  int main() {
  18 -    if(lock.l_type == 1 && lock.l_whence == 2 && lock.l_start == 3 && lock.l_len == 4) {
  19 -               return 0;
  20 -    }
  21 -    return 1;
  22 -  }
  23 -], [
  24 -       flock_type=linux
  25 -    AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
  26 -    AC_MSG_RESULT("yes")
  27 -], AC_MSG_RESULT("no") )
  28 -
  29 -AC_MSG_CHECKING("whether flock struct is BSD ordered")
  30 -AC_TRY_RUN([
  31 -  #include <fcntl.h>
  32 -  struct flock lock = { 1, 2, 3, 4, 5 };
  33 -  int main() {
  34 -    if(lock.l_start == 1 && lock.l_len == 2 && lock.l_type == 4 && lock.l_whence == 5) {
  35 -               return 0;
  36 -    }
  37 -    return 1;
  38 -  }
  39 -], [
  40 -       flock_type=bsd
  41 -    AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type])
  42 -    AC_MSG_RESULT("yes")
  43 -], AC_MSG_RESULT("no") )
  44 +flock_type=linux
  45 +AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
  46
  47  if test "$flock_type" == "unknown"; then
  48         AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no])