diff options
| author | Remi Collet <remi@remirepo.net> | 2017-08-15 12:54:55 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2017-08-15 12:54:55 +0200 |
| commit | 82c57eecbd64325cd60df4e6e51db14f37be7bfc (patch) | |
| tree | 5db427e5fdaebe8baa9ab618d7945e2a953f48e4 /php-sqlite3.patch | |
| parent | 5e3987ccc093c53211350998b44e0f05a3e10322 (diff) | |
Update to 7.0.23RC1
oci8 version is now 2.1.7
Diffstat (limited to 'php-sqlite3.patch')
| -rw-r--r-- | php-sqlite3.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/php-sqlite3.patch b/php-sqlite3.patch deleted file mode 100644 index cdb7d84..0000000 --- a/php-sqlite3.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 666cb6c80226467be262c088a26246c48cdef7e5 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@php.net> -Date: Wed, 2 Aug 2017 14:01:56 +0200 -Subject: [PATCH] fix build with old system libsqlite (sqlite3_errstr may be - missing) - ---- - ext/sqlite3/config0.m4 | 5 ++++- - ext/sqlite3/sqlite3.c | 4 ++++ - 2 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/ext/sqlite3/config0.m4 b/ext/sqlite3/config0.m4 -index 3aa4492..ba760e1 100644 ---- a/ext/sqlite3/config0.m4 -+++ b/ext/sqlite3/config0.m4 -@@ -53,6 +53,9 @@ if test $PHP_SQLITE3 != "no"; then - PHP_CHECK_LIBRARY(sqlite3,sqlite3_column_table_name,[ - AC_DEFINE(SQLITE_ENABLE_COLUMN_METADATA, 1, [have sqlite3 with column metadata enabled]) - ]) -+ PHP_CHECK_LIBRARY(sqlite3,sqlite3_errstr,[ -+ AC_DEFINE(HAVE_SQLITE3_ERRSTR, 1, [have sqlite3_errstr function]) -+ ]) - - PHP_CHECK_LIBRARY(sqlite3,sqlite3_load_extension, - [], -@@ -75,7 +78,7 @@ if test $PHP_SQLITE3 != "no"; then - debug_flags="-DSQLITE_DEBUG=1" - fi - -- other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS4=1 -DSQLITE_ENABLE_FTS5=1 -DSQLITE_CORE=1 -DSQLITE_ENABLE_COLUMN_METADATA=1" -+ other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS4=1 -DSQLITE_ENABLE_FTS5=1 -DSQLITE_CORE=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DHAVE_SQLITE3_ERRSTR=1" - - dnl As long as intl is not shared we can have ICU support - if test "$PHP_INTL" = "yes" && test "$PHP_INTL_SHARED" != "yes"; then -diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c -index dcbc03c..a22f455 100644 ---- a/ext/sqlite3/sqlite3.c -+++ b/ext/sqlite3/sqlite3.c -@@ -148,7 +148,11 @@ PHP_METHOD(sqlite3, open) - #endif - if (rc != SQLITE_OK) { - zend_throw_exception_ex(zend_ce_exception, 0, "Unable to open database: %s", -+#ifdef HAVE_SQLITE3_ERRSTR - db_obj->db ? sqlite3_errmsg(db_obj->db) : sqlite3_errstr(rc)); -+#else -+ db_obj->db ? sqlite3_errmsg(db_obj->db) : ""); -+#endif - if (fullpath != filename) { - efree(fullpath); - } --- -2.1.4 - |