]> git.pld-linux.org Git - packages/php.git/blob - php-oracle-instantclient.patch
Merge 4:5.3.28-7, 4:5.6.4-2 triggers for rpm 4.16
[packages/php.git] / php-oracle-instantclient.patch
1 checking Oracle Instant Client SDK header directory... configure: error: Oracle Instant Client SDK header files not found
2
3 --- php-5.3.3/ext/oci8/config.m4.orig   2010-06-25 23:18:09.000000000 +0200
4 +++ php-5.3.3/ext/oci8/config.m4        2010-09-10 19:37:23.484315002 +0200
5 @@ -304,6 +304,9 @@
6  
7      AC_MSG_CHECKING([Oracle Instant Client SDK header directory])
8  
9 +    dnl Header directory for Instant Client SDK PLD RPM install
10 +    OCISDKPLDINC=$PHP_OCI8_INSTANT_CLIENT/../include/oracle/client
11 +
12      dnl Header directory for Instant Client SDK RPM install
13      OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/\(.*\)/client\('${PHP_OCI8_IC_LIBDIR_SUFFIX}'\)*/lib[/]*$!/usr/include/oracle/\1/client\2!'`
14  
15 @@ -313,7 +316,11 @@
16      dnl Header directory for manual installation
17      OCISDKMANINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!\(.*\)/lib[/]*$!\1/include!'`
18  
19 -    if test -f "$OCISDKRPMINC/oci.h"; then
20 +    if test -f "$OCISDKPLDINC/oci.h"; then
21 +      AC_MSG_RESULT($OCISDKPLDINC)
22 +      PHP_ADD_INCLUDE($OCISDKPLDINC)
23 +      OCI8INCDIR=$OCISDKPLDINC
24 +    elif test -f "$OCISDKRPMINC/oci.h"; then
25        AC_MSG_RESULT($OCISDKRPMINC)
26        PHP_ADD_INCLUDE($OCISDKRPMINC)
27        OCI8INCDIR=$OCISDKRPMINC
28 --- php-7.2.0RC1/ext/pdo_oci/config.m4~ 2017-09-11 14:32:13.000000000 +0300
29 +++ php-7.2.0RC1/ext/pdo_oci/config.m4  2017-09-11 14:45:25.019346828 +0300
30 @@ -113,6 +113,9 @@
31      elif test -f "$OCISDKZIPINC/oci.h" ; then
32        PHP_ADD_INCLUDE($OCISDKZIPINC)
33        AC_MSG_RESULT($OCISDKZIPINC)
34 +    elif test -f $PDO_OCI_LIB_DIR/../include/oracle/client/oci.h ; then
35 +      PHP_ADD_INCLUDE($PDO_OCI_LIB_DIR/../include/oracle/client)
36 +      AC_MSG_RESULT($PDO_OCI_LIB_DIR/../include/oracle/client)
37      else
38        AC_MSG_ERROR([I'm too dumb to figure out where the include dir is in your Instant Client install])
39      fi
This page took 0.0257 seconds and 3 git commands to generate.