summaryrefslogtreecommitdiffstats
path: root/php-8.2.0-iodbc.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2024-09-23 15:31:00 +0200
committerRemi Collet <remi@php.net>2024-09-23 15:31:00 +0200
commit740a14090dec83951484a2705d7ffc7555ebb768 (patch)
tree7768a1c01872b781aaa4d530dd0cac8fe3bd7e3d /php-8.2.0-iodbc.patch
parent16b62b61c0de11f9b89c4805a9b37e9bbc2ec12f (diff)
update to 8.4.0beta5
drop oci8, pdo_oci8, pspell and imap extensions disable ZTS build
Diffstat (limited to 'php-8.2.0-iodbc.patch')
-rw-r--r--php-8.2.0-iodbc.patch41
1 files changed, 0 insertions, 41 deletions
diff --git a/php-8.2.0-iodbc.patch b/php-8.2.0-iodbc.patch
deleted file mode 100644
index ba480aa..0000000
--- a/php-8.2.0-iodbc.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From fbdf54c9efefaaa78277bbd951532cd9b6f0a16e Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Wed, 14 Aug 2024 14:32:47 +0200
-Subject: [PATCH] fix libodbc detection for headers in sub directory
-
----
- ext/pdo_odbc/config.m4 | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/ext/pdo_odbc/config.m4 b/ext/pdo_odbc/config.m4
-index 72b604199bf72..b4478254ee0cb 100644
---- a/ext/pdo_odbc/config.m4
-+++ b/ext/pdo_odbc/config.m4
-@@ -40,6 +40,7 @@ if test "$PHP_PDO_ODBC" != "no"; then
- pdo_odbc_dir=
- fi
-
-+ dnl TODO use PKG_CHECK_MODULES when possible
- case $pdo_odbc_flavour in
- ibm-db2)
- pdo_odbc_def_libdir=/home/db2inst1/sqllib/lib
-@@ -51,6 +52,7 @@ if test "$PHP_PDO_ODBC" != "no"; then
- pdo_odbc_def_libdir=/usr/local/$PHP_LIBDIR
- pdo_odbc_def_incdir=/usr/local/include
- pdo_odbc_def_lib=iodbc
-+ pdo_odbc_subdir=libiodbc
- ;;
-
- unixODBC|unixodbc)
-@@ -85,6 +87,11 @@ if test "$PHP_PDO_ODBC" != "no"; then
- PDO_ODBC_LIBDIR="$pdo_odbc_def_libdir"
- fi
-
-+ dnl handle installation in /usr/include/libiodbc
-+ if test -n "$pdo_odbc_subdir" -a -d $PDO_ODBC_INCDIR/$pdo_odbc_subdir ; then
-+ PDO_ODBC_INCDIR=$PDO_ODBC_INCDIR/$pdo_odbc_subdir
-+ fi
-+
- AC_MSG_RESULT([$pdo_odbc_flavour
- libs $PDO_ODBC_LIBDIR,
- headers $PDO_ODBC_INCDIR])