Commit | Line | Data |
---|---|---|
4ea200c0 FF |
1 | diff -u -r ../php-7.2.3/ext/opcache/config.m4 ./ext/opcache/config.m4 |
2 | --- ../php-7.2.3/ext/opcache/config.m4 2018-02-27 16:33:06.000000000 +0000 | |
3 | +++ ./ext/opcache/config.m4 2018-03-10 22:37:13.039992109 +0000 | |
4 | @@ -358,7 +358,15 @@ | |
e054b9eb FF |
5 | flock_type=linux |
6 | AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) | |
7 | AC_MSG_RESULT("yes") | |
8 | -], AC_MSG_RESULT("no") ) | |
9 | +], [ | |
10 | + AC_MSG_RESULT("no") | |
11 | +], [ | |
12 | + dnl cross-compiling; assume Linux | |
13 | + flock_type=linux | |
14 | + AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) | |
15 | + AC_MSG_RESULT("yes") | |
16 | +]) | |
17 | + | |
18 | ||
19 | AC_MSG_CHECKING("whether flock struct is BSD ordered") | |
20 | AC_TRY_RUN([ | |
4ea200c0 | 21 | @@ -374,7 +382,13 @@ |
e054b9eb FF |
22 | flock_type=bsd |
23 | AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type]) | |
24 | AC_MSG_RESULT("yes") | |
25 | -], AC_MSG_RESULT("no") ) | |
26 | +], [ | |
27 | + AC_MSG_RESULT("no") | |
28 | +], [ | |
29 | + dnl cross-compiling; assume Linux | |
30 | + AC_MSG_RESULT("no") | |
31 | +]) | |
32 | + | |
33 | ||
4ea200c0 | 34 | if test "$flock_type" = "unknown"; then |
e054b9eb | 35 | AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no]) |
4ea200c0 FF |
36 | @@ -417,6 +431,9 @@ |
37 | Optimizer/zend_dump.c, | |
38 | shared,,-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1,,yes) | |
39 | ||
40 | + OPCACHE_SHARED_LIBADD=-lpcre | |
41 | + PHP_SUBST(OPCACHE_SHARED_LIBADD) | |
42 | + | |
43 | PHP_ADD_BUILD_DIR([$ext_builddir/Optimizer], 1) | |
44 | PHP_ADD_EXTENSION_DEP(opcache, pcre) | |
45 | fi |