0004-OPcache-flock-mechanism-is-obviously-linux-so-force-.patch 1.7 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758
  1. From bedbd41ef0a5ce80b83a6f6eaebd7c90f0bc5615 Mon Sep 17 00:00:00 2001
  2. From: Gustavo Zacarias <gustavo@zacarias.com.ar>
  3. Date: Tue, 9 Aug 2016 11:52:19 +0200
  4. Subject: [PATCH] OPcache: flock mechanism is obviously linux so force it.
  5. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
  6. ---
  7. ext/opcache/config.m4 | 34 ++--------------------------------
  8. 1 file changed, 2 insertions(+), 32 deletions(-)
  9. diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
  10. index fbb9b21..ffddc8e 100644
  11. --- a/ext/opcache/config.m4
  12. +++ b/ext/opcache/config.m4
  13. @@ -343,38 +343,8 @@ int main() {
  14. msg=yes,msg=no,msg=no)
  15. AC_MSG_RESULT([$msg])
  16. -flock_type=unknown
  17. -AC_MSG_CHECKING("whether flock struct is linux ordered")
  18. -AC_TRY_RUN([
  19. - #include <fcntl.h>
  20. - struct flock lock = { 1, 2, 3, 4, 5 };
  21. - int main() {
  22. - if(lock.l_type == 1 && lock.l_whence == 2 && lock.l_start == 3 && lock.l_len == 4) {
  23. - return 0;
  24. - }
  25. - return 1;
  26. - }
  27. -], [
  28. - flock_type=linux
  29. - AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
  30. - AC_MSG_RESULT("yes")
  31. -], AC_MSG_RESULT("no") )
  32. -
  33. -AC_MSG_CHECKING("whether flock struct is BSD ordered")
  34. -AC_TRY_RUN([
  35. - #include <fcntl.h>
  36. - struct flock lock = { 1, 2, 3, 4, 5 };
  37. - int main() {
  38. - if(lock.l_start == 1 && lock.l_len == 2 && lock.l_type == 4 && lock.l_whence == 5) {
  39. - return 0;
  40. - }
  41. - return 1;
  42. - }
  43. -], [
  44. - flock_type=bsd
  45. - AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type])
  46. - AC_MSG_RESULT("yes")
  47. -], AC_MSG_RESULT("no") )
  48. +flock_type=linux
  49. +AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
  50. if test "$flock_type" = "unknown"; then
  51. AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no])
  52. --
  53. 2.7.4