From c802620f713647e2e9b4d6af5904ba5c2915f0bd Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 7 Oct 2019 16:38:39 +0200
Subject: [PATCH] add patch from https://github.com/php/php-src/pull/4794   to
 ensure opcache is always linked with librt

---
 php-librt.patch | 23 +++++++++++++++++++++++
 php.spec        | 14 ++++++++------
 2 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 php-librt.patch

diff --git a/php-librt.patch b/php-librt.patch
new file mode 100644
index 0000000..b2a9c58
--- /dev/null
+++ b/php-librt.patch
@@ -0,0 +1,23 @@
+diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
+index a388dd787b..6876d37c08 100644
+--- a/ext/opcache/config.m4
++++ b/ext/opcache/config.m4
+@@ -2,7 +2,7 @@ PHP_ARG_ENABLE([opcache],
+   [whether to enable Zend OPcache support],
+   [AS_HELP_STRING([--disable-opcache],
+     [Disable Zend OPcache support])],
+-  [yes])
++  [shared])
+ 
+ PHP_ARG_ENABLE([huge-code-pages],
+   [whether to enable copying PHP CODE pages into HUGE PAGES],
+@@ -248,6 +248,9 @@ int main() {
+ 	Optimizer/zend_dump.c,
+ 	shared,,-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1,,yes)
+ 
++  PHP_CHECK_LIBRARY(rt, shm_unlink, [PHP_ADD_LIBRARY(rt,1,OPCACHE_SHARED_LIBADD)])
++
+   PHP_ADD_BUILD_DIR([$ext_builddir/Optimizer], 1)
+   PHP_ADD_EXTENSION_DEP(opcache, pcre)
++  PHP_SUBST(OPCACHE_SHARED_LIBADD)
+ fi
diff --git a/php.spec b/php.spec
index ba67dea..3c32132 100644
--- a/php.spec
+++ b/php.spec
@@ -108,6 +108,7 @@ Patch47: php-5.6.3-phpinfo.patch
 # Upstream fixes (100+)
 # fix for https://bugs.php.net/78622
 Patch100: php-aarch64.patch
+Patch101: php-librt.patch
 
 # Security fixes (200+)
 
@@ -715,6 +716,7 @@ in pure PHP.
 
 # upstream patches
 %patch100 -p1 -b .wip
+%patch101 -p1 -b .wip2
 
 # security patches
 
@@ -880,8 +882,7 @@ pushd build-cgi
 
 build --libdir=%{_libdir}/php \
       --enable-pcntl \
-      --enable-opcache \
-      --enable-opcache-file \
+      --enable-opcache=shared \
       --enable-phpdbg \
 %if %{with_imap}
       --with-imap=shared --with-imap-ssl \
@@ -1010,8 +1011,7 @@ build --includedir=%{_includedir}/php-zts \
       --disable-cgi \
       --with-config-file-scan-dir=%{_sysconfdir}/php-zts.d \
       --enable-pcntl \
-      --enable-opcache \
-      --enable-opcache-file \
+      --enable-opcache=shared \
 %if %{with_imap}
       --with-imap=shared --with-imap-ssl \
 %endif
@@ -1236,7 +1236,7 @@ for mod in pgsql odbc ldap snmp \
     sodium \
 %endif
     posix shmop sysvshm sysvsem sysvmsg xml \
-    pdo_mysql pdo pdo_pgsql pdo_odbc pdo_sqlite \
+    pdo pdo_mysql pdo pdo_pgsql pdo_odbc pdo_sqlite \
 %if %{with_firebird}
     pdo_firebird \
 %endif
@@ -1248,8 +1248,8 @@ do
     case $mod in
       opcache)
         # Zend extensions
-        ini=10-${mod}.ini;;
         TESTCMD="$TESTCMD --define zend_extension=$mod"
+        ini=10-${mod}.ini;;
       pdo_*|mysqli|xmlreader|xmlrpc)
         # Extensions with dependencies on 20-*
         TESTCMD="$TESTCMD --define extension=$mod"
@@ -1510,6 +1510,8 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
 %changelog
 * Mon Oct  7 2019 Remi Collet <remi@remirepo.net> - 7.4.0~RC3-2
 - ensure all shared extensions can be loaded
+- add patch from https://github.com/php/php-src/pull/4794
+  to ensure opcache is always linked with librt
 
 * Tue Oct  1 2019 Remi Collet <remi@remirepo.net> - 7.4.0~RC3-1
 - update to 7.4.0RC3