diff options
| author | ajs124 <git@ajs124.de> | 2021-01-08 01:28:25 +0100 |
|---|---|---|
| committer | ajs124 <git@ajs124.de> | 2021-01-08 01:29:07 +0100 |
| commit | 0f04df98a2d92497274d33be85c60b247eba41bc (patch) | |
| tree | 56ed9969f75cabbfadbd125807504c9404117ae5 /pkgs/development/interpreters | |
| parent | 0821afd6018b04762ec3949a19d6ee5e513c7716 (diff) | |
| download | nixlib-0f04df98a2d92497274d33be85c60b247eba41bc.tar nixlib-0f04df98a2d92497274d33be85c60b247eba41bc.tar.gz nixlib-0f04df98a2d92497274d33be85c60b247eba41bc.tar.bz2 nixlib-0f04df98a2d92497274d33be85c60b247eba41bc.tar.lz nixlib-0f04df98a2d92497274d33be85c60b247eba41bc.tar.xz nixlib-0f04df98a2d92497274d33be85c60b247eba41bc.tar.zst nixlib-0f04df98a2d92497274d33be85c60b247eba41bc.zip | |
php80Extensions.opcache: drop patch
does not apply anymore and it compiles without it now
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/php/fix-opcache-configure.patch | 81 |
1 files changed, 0 insertions, 81 deletions
diff --git a/pkgs/development/interpreters/php/fix-opcache-configure.patch b/pkgs/development/interpreters/php/fix-opcache-configure.patch deleted file mode 100644 index e67d2cc7bc79..000000000000 --- a/pkgs/development/interpreters/php/fix-opcache-configure.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff --git a/Zend/Zend.m4 b/Zend/Zend.m4 -index 726188597496..781e51d3e44c 100644 ---- a/Zend/Zend.m4 -+++ b/Zend/Zend.m4 -@@ -190,12 +190,6 @@ dnl LIBZEND_OTHER_CHECKS - dnl - AC_DEFUN([LIBZEND_OTHER_CHECKS],[ - --AC_ARG_ENABLE([zts], -- [AS_HELP_STRING([--enable-zts], -- [Enable thread safety])], -- [ZEND_ZTS=$enableval], -- [ZEND_ZTS=no]) -- - AC_MSG_CHECKING(whether to enable thread-safety) - AC_MSG_RESULT($ZEND_ZTS) - -diff --git a/configure.ac b/configure.ac -index 8d6e922fa9bf..e07a75d19ac7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -797,6 +797,19 @@ if test "$PHP_DEBUG_ASSERTIONS" = "yes"; then - ZEND_DEBUG=yes - fi - -+AC_ARG_ENABLE([zts], -+ [AS_HELP_STRING([--enable-zts], -+ [Enable thread safety])], -+ [ZEND_ZTS=$enableval], -+ [ZEND_ZTS=no]) -+ -+if test "$ZEND_ZTS" = "yes"; then -+ AC_DEFINE(ZTS, 1,[ ]) -+ PHP_THREAD_SAFETY=yes -+else -+ PHP_THREAD_SAFETY=no -+fi -+ - PHP_ARG_ENABLE([rtld-now], - [whether to dlopen extensions with RTLD_NOW instead of RTLD_LAZY], - [AS_HELP_STRING([--enable-rtld-now], -@@ -1136,13 +1149,6 @@ LIBZEND_BASIC_CHECKS - LIBZEND_DLSYM_CHECK - LIBZEND_OTHER_CHECKS - --if test "$ZEND_ZTS" = "yes"; then -- AC_DEFINE(ZTS,1,[ ]) -- PHP_THREAD_SAFETY=yes --else -- PHP_THREAD_SAFETY=no --fi -- - INCLUDES="$INCLUDES -I\$(top_builddir)/TSRM" - INCLUDES="$INCLUDES -I\$(top_builddir)/Zend" - -diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 -index 054cd28c0247..93d72fb73d19 100644 ---- a/ext/opcache/config.m4 -+++ b/ext/opcache/config.m4 -@@ -66,7 +66,7 @@ if test "$PHP_OPCACHE" != "no"; then - esac - fi - -- if test "$enable_zts" = "yes"; then -+ if test "$PHP_THREAD_SAFETY" = "yes"; then - DASM_FLAGS="$DASM_FLAGS -D ZTS=1" - fi - -diff --git a/ext/session/config.m4 b/ext/session/config.m4 -index 7abc8813b72a..da31bbde86cc 100644 ---- a/ext/session/config.m4 -+++ b/ext/session/config.m4 -@@ -31,7 +31,7 @@ if test "$PHP_MM" != "no"; then - AC_MSG_ERROR(cannot find mm library) - fi - -- if test "$enable_zts" = "yes"; then -+ if test "$PHP_THREAD_SAFETY" = "yes"; then - dnl The mm library is not thread-safe, and mod_mm.c refuses to compile. - AC_MSG_ERROR(--with-mm cannot be combined with --enable-zts) - fi \ No newline at end of file |