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

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960
  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. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
  7. [Bernd: update for 7.2.12]
  8. ---
  9. ext/opcache/config.m4 | 34 ++--------------------------------
  10. 1 file changed, 2 insertions(+), 32 deletions(-)
  11. diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
  12. index fbb9b21..ffddc8e 100644
  13. --- a/ext/opcache/config.m4
  14. +++ b/ext/opcache/config.m4
  15. @@ -343,38 +343,8 @@ int main() {
  16. msg=yes,msg=no,msg=no)
  17. AC_MSG_RESULT([$msg])
  18. -flock_type=unknown
  19. -AC_MSG_CHECKING("whether flock struct is linux ordered")
  20. -AC_TRY_RUN([
  21. - #include <fcntl.h>
  22. - struct flock lock = { 1, 2, 3, 4, 5 };
  23. - int main() {
  24. - if(lock.l_type == 1 && lock.l_whence == 2 && lock.l_start == 3 && lock.l_len == 4) {
  25. - return 0;
  26. - }
  27. - return 1;
  28. - }
  29. -], [
  30. - flock_type=linux
  31. - AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
  32. - AC_MSG_RESULT("yes")
  33. -], AC_MSG_RESULT("no") )
  34. -
  35. -AC_MSG_CHECKING("whether flock struct is BSD ordered")
  36. -AC_TRY_RUN([
  37. - #include <fcntl.h>
  38. - struct flock lock = { 1, 2, 3, 4, 5 };
  39. - int main() {
  40. - if(lock.l_start == 1 && lock.l_len == 2 && lock.l_type == 4 && lock.l_whence == 5) {
  41. - return 0;
  42. - }
  43. - return 1;
  44. - }
  45. -], [
  46. - flock_type=bsd
  47. - AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type])
  48. - AC_MSG_RESULT("yes")
  49. -], AC_MSG_RESULT("no") )
  50. +flock_type=linux
  51. +AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
  52. if test "$flock_type" = "unknown"; then
  53. AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no])
  54. --
  55. 2.7.4