From: Remi Collet <remi@php.net>
Date: Tue, 8 Oct 2019 08:49:30 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3dabce087c870565fa6a206f77369aea1fe44199;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  add librt for opcache
---

3dabce087c870565fa6a206f77369aea1fe44199
diff --cc ext/opcache/config.m4
index ef1e874b3e,6c40cafc1c..5e61575d48
--- a/ext/opcache/config.m4
+++ b/ext/opcache/config.m4
@@@ -321,9 -259,5 +327,10 @@@ int main() 
  
    PHP_ADD_BUILD_DIR([$ext_builddir/Optimizer], 1)
    PHP_ADD_EXTENSION_DEP(opcache, pcre)
 +
 +  if test "$PHP_OPCACHE_JIT" = "yes"; then
 +    PHP_ADD_BUILD_DIR([$ext_builddir/jit], 1)
 +    PHP_ADD_MAKEFILE_FRAGMENT($ext_srcdir/jit/Makefile.frag)
 +  fi
+   PHP_SUBST(OPCACHE_SHARED_LIBADD)
  fi