add patch from https://github.com/php/php-src/pull/4794
to ensure opcache is always linked with librt
This commit is contained in:
parent
2e093dc79e
commit
c802620f71
23
php-librt.patch
Normal file
23
php-librt.patch
Normal file
@ -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
|
14
php.spec
14
php.spec
@ -108,6 +108,7 @@ Patch47: php-5.6.3-phpinfo.patch
|
|||||||
# Upstream fixes (100+)
|
# Upstream fixes (100+)
|
||||||
# fix for https://bugs.php.net/78622
|
# fix for https://bugs.php.net/78622
|
||||||
Patch100: php-aarch64.patch
|
Patch100: php-aarch64.patch
|
||||||
|
Patch101: php-librt.patch
|
||||||
|
|
||||||
# Security fixes (200+)
|
# Security fixes (200+)
|
||||||
|
|
||||||
@ -715,6 +716,7 @@ in pure PHP.
|
|||||||
|
|
||||||
# upstream patches
|
# upstream patches
|
||||||
%patch100 -p1 -b .wip
|
%patch100 -p1 -b .wip
|
||||||
|
%patch101 -p1 -b .wip2
|
||||||
|
|
||||||
# security patches
|
# security patches
|
||||||
|
|
||||||
@ -880,8 +882,7 @@ pushd build-cgi
|
|||||||
|
|
||||||
build --libdir=%{_libdir}/php \
|
build --libdir=%{_libdir}/php \
|
||||||
--enable-pcntl \
|
--enable-pcntl \
|
||||||
--enable-opcache \
|
--enable-opcache=shared \
|
||||||
--enable-opcache-file \
|
|
||||||
--enable-phpdbg \
|
--enable-phpdbg \
|
||||||
%if %{with_imap}
|
%if %{with_imap}
|
||||||
--with-imap=shared --with-imap-ssl \
|
--with-imap=shared --with-imap-ssl \
|
||||||
@ -1010,8 +1011,7 @@ build --includedir=%{_includedir}/php-zts \
|
|||||||
--disable-cgi \
|
--disable-cgi \
|
||||||
--with-config-file-scan-dir=%{_sysconfdir}/php-zts.d \
|
--with-config-file-scan-dir=%{_sysconfdir}/php-zts.d \
|
||||||
--enable-pcntl \
|
--enable-pcntl \
|
||||||
--enable-opcache \
|
--enable-opcache=shared \
|
||||||
--enable-opcache-file \
|
|
||||||
%if %{with_imap}
|
%if %{with_imap}
|
||||||
--with-imap=shared --with-imap-ssl \
|
--with-imap=shared --with-imap-ssl \
|
||||||
%endif
|
%endif
|
||||||
@ -1236,7 +1236,7 @@ for mod in pgsql odbc ldap snmp \
|
|||||||
sodium \
|
sodium \
|
||||||
%endif
|
%endif
|
||||||
posix shmop sysvshm sysvsem sysvmsg xml \
|
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}
|
%if %{with_firebird}
|
||||||
pdo_firebird \
|
pdo_firebird \
|
||||||
%endif
|
%endif
|
||||||
@ -1248,8 +1248,8 @@ do
|
|||||||
case $mod in
|
case $mod in
|
||||||
opcache)
|
opcache)
|
||||||
# Zend extensions
|
# Zend extensions
|
||||||
ini=10-${mod}.ini;;
|
|
||||||
TESTCMD="$TESTCMD --define zend_extension=$mod"
|
TESTCMD="$TESTCMD --define zend_extension=$mod"
|
||||||
|
ini=10-${mod}.ini;;
|
||||||
pdo_*|mysqli|xmlreader|xmlrpc)
|
pdo_*|mysqli|xmlreader|xmlrpc)
|
||||||
# Extensions with dependencies on 20-*
|
# Extensions with dependencies on 20-*
|
||||||
TESTCMD="$TESTCMD --define extension=$mod"
|
TESTCMD="$TESTCMD --define extension=$mod"
|
||||||
@ -1510,6 +1510,8 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
|
|||||||
%changelog
|
%changelog
|
||||||
* Mon Oct 7 2019 Remi Collet <remi@remirepo.net> - 7.4.0~RC3-2
|
* Mon Oct 7 2019 Remi Collet <remi@remirepo.net> - 7.4.0~RC3-2
|
||||||
- ensure all shared extensions can be loaded
|
- 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
|
* Tue Oct 1 2019 Remi Collet <remi@remirepo.net> - 7.4.0~RC3-1
|
||||||
- update to 7.4.0RC3
|
- update to 7.4.0RC3
|
||||||
|
Loading…
Reference in New Issue
Block a user