diff options
Diffstat (limited to 'php-5.2.15-oci8conf.patch')
-rw-r--r-- | php-5.2.15-oci8conf.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/php-5.2.15-oci8conf.patch b/php-5.2.15-oci8conf.patch new file mode 100644 index 0000000..ff56a59 --- /dev/null +++ b/php-5.2.15-oci8conf.patch @@ -0,0 +1,48 @@ +--- ext/oci8/config.m4.remi-oci8 2008-12-05 17:29:15.000000000 +0100 ++++ ext/oci8/config.m4 2008-12-05 17:30:26.000000000 +0100 +@@ -371,7 +371,7 @@ + AC_MSG_CHECKING([Oracle Instant Client SDK header directory]) + + dnl Header directory for Instant Client SDK RPM install +- OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/\(.*\)/client\('${LIBDIR_SUFFIX}'\)*/lib[/]*$!/usr/include/oracle/\1/client\2!'` ++ OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/\(lib64\|lib\)/oracle/\(.*\)/\(client64\|client\)/lib[/]*$!/usr/include/oracle/\2/\3!'` + + dnl Header directory for Instant Client SDK zip file install + OCISDKZIPINC=$PHP_OCI8_INSTANT_CLIENT/sdk/include +diff -up ext/pdo_oci/config.m4.orig ext/pdo_oci/config.m4 +--- ext/pdo_oci/config.m4.orig 2008-12-05 17:33:05.000000000 +0100 ++++ ext/pdo_oci/config.m4 2008-12-05 17:35:21.000000000 +0100 +@@ -82,7 +82,10 @@ You need to tell me where to find your O + PDO_OCI_IC_PREFIX="`echo $PDO_OCI_DIR | cut -d, -f2`" + PDO_OCI_IC_VERS="`echo $PDO_OCI_DIR | cut -d, -f3`" + AC_MSG_CHECKING([for oci.h]) +- if test -f $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client/oci.h ; then ++ if test -f $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client64/oci.h ; then ++ PHP_ADD_INCLUDE($PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client64) ++ AC_MSG_RESULT($PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client64) ++ elif test -f $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client/oci.h ; then + PHP_ADD_INCLUDE($PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client) + AC_MSG_RESULT($PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client) + elif test -f $PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include/oci.h ; then +@@ -99,6 +102,10 @@ You need to tell me where to find your O + fi + if test -f "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/lib/libclntsh.so" ; then + PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/lib" ++ elif test -f "$PDO_OCI_IC_PREFIX/lib64/oracle/$PDO_OCI_IC_VERS/client64/lib/libclntsh.so" ; then ++ PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/lib64/oracle/$PDO_OCI_IC_VERS/client64/lib" ++ elif test -f "$PDO_OCI_IC_PREFIX/lib64/oracle/$PDO_OCI_IC_VERS/client/lib/libclntsh.so" ; then ++ PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/lib64/oracle/$PDO_OCI_IC_VERS/client/lib" + elif test -f "$PDO_OCI_IC_PREFIX/client/lib/libclntsh.so" ; then + PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/client/lib" + elif test -f "$PDO_OCI_IC_PREFIX/libclntsh.so" ; then +--- ext/ldap/php_ldap.h.remi-oci8 2010-01-03 10:23:27.000000000 +0100 ++++ ext/ldap/php_ldap.h 2010-12-11 08:53:26.065832296 +0100 +@@ -26,7 +26,7 @@ + #ifndef HAVE_ORALDAP + #include <lber.h> + #endif +-#include <ldap.h> ++#include "/usr/include/ldap.h" + + extern zend_module_entry ldap_module_entry; + #define ldap_module_ptr &ldap_module_entry |