diff options
| author | Remi Collet <remi@remirepo.net> | 2020-09-11 14:46:18 +0200 | 
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-09-11 14:46:18 +0200 | 
| commit | c891bb332af826e14cfb28614b1b9fedf80ec47d (patch) | |
| tree | cf69b72e62e42fa56507df9c980c3d7d77a568af /php-7.4.0-libdb.patch | |
| parent | f252207863961c2e1431b6d0079fdbdd73b67f7f (diff) | |
update to 8.0.0beta3
bump ABI/API versions
drop xmlrpc extension
json is now build statically
use system nikic/php-parser if available to generate
  C headers from PHP stub
switch from "runselftest" option to bcond_without tests
enchant: use libenchant-2 instead of libenchant
rename 15-php.conf to 20-php.conf to ensure load order
oci8 version is now 3.0.0
Diffstat (limited to 'php-7.4.0-libdb.patch')
| -rw-r--r-- | php-7.4.0-libdb.patch | 92 | 
1 files changed, 92 insertions, 0 deletions
| diff --git a/php-7.4.0-libdb.patch b/php-7.4.0-libdb.patch new file mode 100644 index 0000000..d7c6289 --- /dev/null +++ b/php-7.4.0-libdb.patch @@ -0,0 +1,92 @@ +diff -up ./ext/dba/config.m4.libdb ./ext/dba/config.m4 +--- ./ext/dba/config.m4.libdb	2020-04-09 14:06:11.000000000 +0200 ++++ ./ext/dba/config.m4	2020-04-09 14:35:08.208605065 +0200 +@@ -375,61 +375,13 @@ if test "$PHP_DB4" != "no"; then +   dbdp4="/usr/local/BerkeleyDB.4." +   dbdp5="/usr/local/BerkeleyDB.5." +   for i in $PHP_DB4 ${dbdp5}1 ${dbdp5}0 ${dbdp4}8 ${dbdp4}7 ${dbdp4}6 ${dbdp4}5 ${dbdp4}4 ${dbdp4}3 ${dbdp4}2 ${dbdp4}1 ${dbdp}0 /usr/local /usr; do +-    if test -f "$i/db5/db.h"; then +-      THIS_PREFIX=$i +-      THIS_INCLUDE=$i/db5/db.h +-      break +-    elif test -f "$i/db4/db.h"; then +-      THIS_PREFIX=$i +-      THIS_INCLUDE=$i/db4/db.h +-      break +-    elif test -f "$i/include/db5.3/db.h"; then +-      THIS_PREFIX=$i +-      THIS_INCLUDE=$i/include/db5.3/db.h +-      break +-    elif test -f "$i/include/db5.1/db.h"; then +-      THIS_PREFIX=$i +-      THIS_INCLUDE=$i/include/db5.1/db.h +-      break +-    elif test -f "$i/include/db5.0/db.h"; then +-      THIS_PREFIX=$i +-      THIS_INCLUDE=$i/include/db5.0/db.h +-      break +-    elif test -f "$i/include/db4.8/db.h"; then +-      THIS_PREFIX=$i +-      THIS_INCLUDE=$i/include/db4.8/db.h +-      break +-    elif test -f "$i/include/db4.7/db.h"; then +-      THIS_PREFIX=$i +-      THIS_INCLUDE=$i/include/db4.7/db.h +-      break +-    elif test -f "$i/include/db4.6/db.h"; then +-      THIS_PREFIX=$i +-      THIS_INCLUDE=$i/include/db4.6/db.h +-      break +-    elif test -f "$i/include/db4.5/db.h"; then +-      THIS_PREFIX=$i +-      THIS_INCLUDE=$i/include/db4.5/db.h +-      break +-    elif test -f "$i/include/db4/db.h"; then +-      THIS_PREFIX=$i +-      THIS_INCLUDE=$i/include/db4/db.h +-      break +-    elif test -f "$i/include/db/db4.h"; then +-      THIS_PREFIX=$i +-      THIS_INCLUDE=$i/include/db/db4.h +-      break +-    elif test -f "$i/include/db4.h"; then +-      THIS_PREFIX=$i +-      THIS_INCLUDE=$i/include/db4.h +-      break +-    elif test -f "$i/include/db.h"; then ++    if test -f "$i/include/db.h"; then +       THIS_PREFIX=$i +       THIS_INCLUDE=$i/include/db.h +       break +     fi +   done +-  PHP_DBA_DB_CHECK(4, db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) ++  PHP_DBA_DB_CHECK(4, db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) + fi + PHP_DBA_STD_RESULT(db4,Berkeley DB4) +  +diff -up ./ext/dba/dba.c.libdb ./ext/dba/dba.c +--- ./ext/dba/dba.c.libdb	2020-04-09 14:06:11.000000000 +0200 ++++ ./ext/dba/dba.c	2020-04-09 14:36:30.593275190 +0200 +@@ -50,6 +50,10 @@ + #include "php_lmdb.h" + #include "dba_arginfo.h" +  ++#ifdef DB4_INCLUDE_FILE ++#include DB4_INCLUDE_FILE ++#endif ++ + PHP_MINIT_FUNCTION(dba); + PHP_MSHUTDOWN_FUNCTION(dba); + PHP_MINFO_FUNCTION(dba); +@@ -459,6 +463,10 @@ PHP_MINFO_FUNCTION(dba) +  + 	php_info_print_table_start(); +  	php_info_print_table_row(2, "DBA support", "enabled"); ++#ifdef DB_VERSION_STRING ++ 	php_info_print_table_row(2, "libdb header version", DB_VERSION_STRING); ++ 	php_info_print_table_row(2, "libdb library version", db_version(NULL, NULL, NULL)); ++#endif + 	if (handlers.s) { + 		smart_str_0(&handlers); + 		php_info_print_table_row(2, "Supported handlers", ZSTR_VAL(handlers.s)); | 
