|
@@ -5,7 +5,7 @@ Subject: [PATCH] OPcache: flock mechanism is obviously linux so force it.
|
|
|
|
|
|
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
|
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
|
-[Bernd: update for 7.2.12]
|
|
|
|
|
|
+[Bernd: update for 7.2.12 & 7.2.15]
|
|
---
|
|
---
|
|
ext/opcache/config.m4 | 34 ++--------------------------------
|
|
ext/opcache/config.m4 | 34 ++--------------------------------
|
|
1 file changed, 2 insertions(+), 32 deletions(-)
|
|
1 file changed, 2 insertions(+), 32 deletions(-)
|
|
@@ -14,12 +14,30 @@ diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
|
|
index fbb9b21..ffddc8e 100644
|
|
index fbb9b21..ffddc8e 100644
|
|
--- a/ext/opcache/config.m4
|
|
--- a/ext/opcache/config.m4
|
|
+++ b/ext/opcache/config.m4
|
|
+++ b/ext/opcache/config.m4
|
|
-@@ -343,38 +343,8 @@ int main() {
|
|
|
|
|
|
+@@ -343,58 +343,8 @@ int main() {
|
|
msg=yes,msg=no,msg=no)
|
|
msg=yes,msg=no,msg=no)
|
|
AC_MSG_RESULT([$msg])
|
|
AC_MSG_RESULT([$msg])
|
|
|
|
|
|
-flock_type=unknown
|
|
-flock_type=unknown
|
|
--AC_MSG_CHECKING("whether flock struct is linux ordered")
|
|
|
|
|
|
+-AC_MSG_CHECKING(for struct flock layout)
|
|
|
|
+-
|
|
|
|
+-if test "$flock_type" = "unknown"; then
|
|
|
|
+-AC_TRY_RUN([
|
|
|
|
+- #include <fcntl.h>
|
|
|
|
+- struct flock lock = { 1, 2, 3, 4, 5, 6, 7 };
|
|
|
|
+- int main() {
|
|
|
|
+- if(lock.l_type == 1 && lock.l_whence == 2 && lock.l_start == 6 && lock.l_len== 7) {
|
|
|
|
+- return 0;
|
|
|
|
+- }
|
|
|
|
+- return 1;
|
|
|
|
+- }
|
|
|
|
+-], [
|
|
|
|
+- flock_type=aix64
|
|
|
|
+- AC_DEFINE([HAVE_FLOCK_AIX64], [], [Struct flock is 64-bit AIX-type])
|
|
|
|
+-], [])
|
|
|
|
+-fi
|
|
|
|
+-
|
|
|
|
+-if test "$flock_type" = "unknown"; then
|
|
-AC_TRY_RUN([
|
|
-AC_TRY_RUN([
|
|
- #include <fcntl.h>
|
|
- #include <fcntl.h>
|
|
- struct flock lock = { 1, 2, 3, 4, 5 };
|
|
- struct flock lock = { 1, 2, 3, 4, 5 };
|
|
@@ -32,10 +50,10 @@ index fbb9b21..ffddc8e 100644
|
|
-], [
|
|
-], [
|
|
- flock_type=linux
|
|
- flock_type=linux
|
|
- AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
|
|
- AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
|
|
-- AC_MSG_RESULT("yes")
|
|
|
|
--], AC_MSG_RESULT("no") )
|
|
|
|
|
|
+-], [])
|
|
|
|
+-fi
|
|
-
|
|
-
|
|
--AC_MSG_CHECKING("whether flock struct is BSD ordered")
|
|
|
|
|
|
+-if test "$flock_type" = "unknown"; then
|
|
-AC_TRY_RUN([
|
|
-AC_TRY_RUN([
|
|
- #include <fcntl.h>
|
|
- #include <fcntl.h>
|
|
- struct flock lock = { 1, 2, 3, 4, 5 };
|
|
- struct flock lock = { 1, 2, 3, 4, 5 };
|
|
@@ -48,8 +66,10 @@ index fbb9b21..ffddc8e 100644
|
|
-], [
|
|
-], [
|
|
- flock_type=bsd
|
|
- flock_type=bsd
|
|
- AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type])
|
|
- AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type])
|
|
-- AC_MSG_RESULT("yes")
|
|
|
|
--], AC_MSG_RESULT("no") )
|
|
|
|
|
|
+-], [])
|
|
|
|
+-fi
|
|
|
|
+-
|
|
|
|
+-AC_MSG_RESULT([$flock_type])
|
|
+flock_type=linux
|
|
+flock_type=linux
|
|
+AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
|
|
+AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
|
|
|
|
|