49 lines
1.5 KiB
Diff
49 lines
1.5 KiB
Diff
|
OPcache: flock mechanism is obviously linux so force it.
|
||
|
|
|
||
|
|
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||
|
|
|
||
|
|
diff -Nura php-5.6.7.orig/ext/opcache/config.m4 php-5.6.7/ext/opcache/config.m4
|
||
|
|
--- php-5.6.7.orig/ext/opcache/config.m4 2015-04-08 11:08:11.125845540 -0300
|
||
|
|
+++ php-5.6.7/ext/opcache/config.m4 2015-04-08 11:57:23.648831436 -0300
|
||
|
|
@@ -326,38 +326,8 @@
|
||
|
|
msg=yes,msg=no,msg=no)
|
||
|
|
AC_MSG_RESULT([$msg])
|
||
|
|
|
||
|
|
-flock_type=unknown
|
||
|
|
-AC_MSG_CHECKING("whether flock struct is linux ordered")
|
||
|
|
-AC_TRY_RUN([
|
||
|
|
- #include <fcntl.h>
|
||
|
|
- struct flock lock = { 1, 2, 3, 4, 5 };
|
||
|
|
- int main() {
|
||
|
|
- if(lock.l_type == 1 && lock.l_whence == 2 && lock.l_start == 3 && lock.l_len == 4) {
|
||
|
|
- return 0;
|
||
|
|
- }
|
||
|
|
- return 1;
|
||
|
|
- }
|
||
|
|
-], [
|
||
|
|
- flock_type=linux
|
||
|
|
- AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
|
||
|
|
- AC_MSG_RESULT("yes")
|
||
|
|
-], AC_MSG_RESULT("no") )
|
||
|
|
-
|
||
|
|
-AC_MSG_CHECKING("whether flock struct is BSD ordered")
|
||
|
|
-AC_TRY_RUN([
|
||
|
|
- #include <fcntl.h>
|
||
|
|
- struct flock lock = { 1, 2, 3, 4, 5 };
|
||
|
|
- int main() {
|
||
|
|
- if(lock.l_start == 1 && lock.l_len == 2 && lock.l_type == 4 && lock.l_whence == 5) {
|
||
|
|
- return 0;
|
||
|
|
- }
|
||
|
|
- return 1;
|
||
|
|
- }
|
||
|
|
-], [
|
||
|
|
- flock_type=bsd
|
||
|
|
- AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type])
|
||
|
|
- AC_MSG_RESULT("yes")
|
||
|
|
-], AC_MSG_RESULT("no") )
|
||
|
|
+flock_type=linux
|
||
|
|
+AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
|
||
|
|
|
||
|
|
if test "$flock_type" == "unknown"; then
|
||
|
|
AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no])
|