77d120e92b
- new Zend OPcache extension in php-opccache new sub-package - don't display XFAIL tests in report - use xz compressed tarball - build simplexml and xml extensions shared (moved in php-xml) - build bz2, calendar, ctype, exif, ftp, gettext, iconv sockets and tokenizer extensions shared (in php-common) - build gmp extension shared (in php-gmp new sub-package) - build shmop extension shared (moved in php-process) - drop some old compatibility provides (php-api, php-zend-abi, php-pecl-*)
87 lines
2.9 KiB
Diff
87 lines
2.9 KiB
Diff
--- php-5.4.7/ext/dba/config.m4.orig 2012-09-20 12:23:00.548322754 +0200
|
|
+++ php-5.4.7/ext/dba/config.m4 2012-09-20 12:28:07.656380829 +0200
|
|
@@ -312,57 +312,13 @@
|
|
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)
|
|
|
|
--- php-5.4.7/ext/dba/dba.c.old 2012-09-19 14:55:23.868456900 +0200
|
|
+++ php-5.4.7/ext/dba/dba.c 2012-09-19 15:02:42.796009320 +0200
|
|
@@ -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)
|
|
@@ -522,6 +526,10 @@
|
|
|
|
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.c) {
|
|
smart_str_0(&handlers);
|
|
php_info_print_table_row(2, "Supported handlers", handlers.c);
|