0004-flock-type-linux.patch 1.5 KB

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