From 902380c4327684e86ea09cab854640c5b954fd12 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Sun, 8 Mar 2015 07:54:01 +0100
Subject: PHP 5.6.7RC1 (as SCL)

---
 php-odbc.patch | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 php-odbc.patch

(limited to 'php-odbc.patch')

diff --git a/php-odbc.patch b/php-odbc.patch
new file mode 100644
index 0000000..12bff99
--- /dev/null
+++ b/php-odbc.patch
@@ -0,0 +1,40 @@
+From 89f86119d612d539a4ec189aff4d3c077cb608a1 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@php.net>
+Date: Sun, 8 Mar 2015 07:34:51 +0100
+Subject: [PATCH] Fix odbc build as shared
+
+Broken since a41aa46759d20e23af92df00b917ca66c6102412
+---
+ ext/odbc/config.m4 | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
+index f79c461..9555efd 100644
+--- a/ext/odbc/config.m4
++++ b/ext/odbc/config.m4
+@@ -99,6 +99,11 @@ AC_DEFUN([PHP_ODBC_FIND_EMPRESS_BCS_LIBS],[
+ dnl
+ dnl configure options
+ dnl
++
++PHP_ARG_WITH(odbcver,,
++[  --with-odbcver[=HEX]      Force support for the passed ODBC version. A hex number is expected, default 0x0300.
++                             Use the special value of 0 to prevent an explicit ODBCVER to be defined. ], 0x0300)
++
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(adabas,,
+ [  --with-adabas[=DIR]       Include Adabas D support [/usr/local]])
+@@ -490,10 +495,6 @@ PHP_ARG_WITH(dbmaker,,
+   fi
+ fi
+ 
+-PHP_ARG_WITH(odbcver,,
+-[  --with-odbcver[=HEX]      Force support for the passed ODBC version. A hex number is expected, default 0x0300.
+-                             Use the special value of 0 to prevent an explicit ODBCVER to be defined. ], 0x0300)
+-
+ if test "no" != "$PHP_ODBCVER"; then
+   if test "$PHP_ODBCVER" != "0"; then
+     AC_DEFINE_UNQUOTED(ODBCVER, $PHP_ODBCVER, [ The highest supported ODBC version ])
+-- 
+2.1.4
+
-- 
cgit