From 1ef5e3e2e85bb2fe0c49a49f3c55281cd359cef0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 25 Mar 2015 10:58:14 +0100 Subject: php70-php - initial work for 7.0.0-dev - ereg, mssql, mysql and sybase_ct extensions are removed - add pdo-dblib subpackage (instead of php-mssql) - disable oci8 extension, not adapted yet for 7.0 --- php-7.0.0-libdb.patch | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 php-7.0.0-libdb.patch (limited to 'php-7.0.0-libdb.patch') diff --git a/php-7.0.0-libdb.patch b/php-7.0.0-libdb.patch new file mode 100644 index 0000000..9806389 --- /dev/null +++ b/php-7.0.0-libdb.patch @@ -0,0 +1,88 @@ +diff -up php-src-02be73b5fac63a02313b9fe0f204c65d4828edeb/ext/dba/config.m4.libdb php-src-02be73b5fac63a02313b9fe0f204c65d4828edeb/ext/dba/config.m4 +--- php-src-02be73b5fac63a02313b9fe0f204c65d4828edeb/ext/dba/config.m4.libdb 2015-03-25 07:01:04.000000000 +0100 ++++ php-src-02be73b5fac63a02313b9fe0f204c65d4828edeb/ext/dba/config.m4 2015-03-25 08:39:57.404661073 +0100 +@@ -312,57 +312,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.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.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 php-src-02be73b5fac63a02313b9fe0f204c65d4828edeb/ext/dba/dba.c.libdb php-src-02be73b5fac63a02313b9fe0f204c65d4828edeb/ext/dba/dba.c +--- php-src-02be73b5fac63a02313b9fe0f204c65d4828edeb/ext/dba/dba.c.libdb 2015-03-25 07:01:04.000000000 +0100 ++++ php-src-02be73b5fac63a02313b9fe0f204c65d4828edeb/ext/dba/dba.c 2015-03-25 08:41:34.871061250 +0100 +@@ -52,6 +52,10 @@ + #include "php_qdbm.h" + #include "php_tcadb.h" + ++#ifdef DB4_INCLUDE_FILE ++#include DB4_INCLUDE_FILE ++#endif ++ + /* {{{ arginfo */ + ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_popen, 0, 0, 2) + ZEND_ARG_INFO(0, path) +@@ -537,6 +541,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", handlers.s->val); -- cgit