1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
From e1362b3cf0021c1c8492594da08b7a017b3585ba Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 7 Oct 2019 16:31:09 +0200
Subject: [PATCH] add librt for opcache
---
ext/opcache/config.m4 | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
index a388dd787b67..6c40cafc1c39 100644
--- a/ext/opcache/config.m4
+++ b/ext/opcache/config.m4
@@ -13,6 +13,9 @@ PHP_ARG_ENABLE([huge-code-pages],
if test "$PHP_OPCACHE" != "no"; then
+ dnl Always build as shared extension
+ ext_shared=yes
+
if test "$PHP_HUGE_CODE_PAGES" = "yes"; then
AC_DEFINE(HAVE_HUGE_CODE_PAGES, 1, [Define to enable copying PHP CODE pages into HUGE PAGES (experimental)])
fi
@@ -141,6 +144,7 @@ int main() {
msg=yes],[msg=no],[msg=no])
AC_MSG_RESULT([$msg])
+ PHP_CHECK_FUNC_LIB(shm_open, rt)
AC_MSG_CHECKING(for mmap() using shm_open() shared memory support)
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <sys/types.h>
@@ -207,8 +211,13 @@ int main() {
}
]])],[dnl
AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM support])
- msg=yes],[msg=no],[msg=no])
- AC_MSG_RESULT([$msg])
+ AC_MSG_RESULT([yes])
+ PHP_CHECK_LIBRARY(rt, shm_unlink, [PHP_ADD_LIBRARY(rt,1,OPCACHE_SHARED_LIBADD)])
+ ],[
+ AC_MSG_RESULT([no])
+ ],[
+ AC_MSG_RESULT([no])
+ ])
PHP_NEW_EXTENSION(opcache,
ZendAccelerator.c \
@@ -250,4 +259,5 @@ int main() {
PHP_ADD_BUILD_DIR([$ext_builddir/Optimizer], 1)
PHP_ADD_EXTENSION_DEP(opcache, pcre)
+ PHP_SUBST(OPCACHE_SHARED_LIBADD)
fi
|
