diff options
| author | Maxim Novikov | 2018-09-04 18:03:54 +0300 |
|---|---|---|
| committer | Maxim Novikov | 2018-09-04 18:03:54 +0300 |
| commit | ae993a5dc70f8a5e050eceb2ad89d1f58470c4e4 (patch) | |
| tree | 6ed00d33cb5efa6974fc1e0df3bd17da043e0ee4 | |
| parent | f46157d0ed6a2a5220988ddf57ff3275ab926fec (diff) | |
| download | aur-ae993a5dc70f8a5e050eceb2ad89d1f58470c4e4.tar.gz | |
Update to 7.2.9
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 2 | ||||
| -rw-r--r-- | patch.diff | 41 |
3 files changed, 24 insertions, 25 deletions
@@ -1,6 +1,6 @@ pkgbase = php-pdo-oci pkgdesc = PDO driver for OCI8 - pkgver = 7.1.1 + pkgver = 7.2.9 pkgrel = 1 url = https://github.com/php/php-src/tree/master/ext/pdo_oci arch = x86_64 @@ -8,8 +8,8 @@ pkgbase = php-pdo-oci depends = php>=7.0.0 depends = php-oci8>=2.1.0 conflicts = php-pdo-oci-git - backup = etc/php/conf.d/pdo_oci.ini - source = https://github.com/php/php-src/archive/php-7.1.1.tar.gz + backup = etc/php/conf.d/${_extname}.ini + source = https://github.com/php/php-src/archive/php-7.2.9.tar.gz source = patch.diff md5sums = SKIP md5sums = SKIP @@ -1,7 +1,7 @@ # Maintainer: Maxim Novikov <the.mlex@gmail.com> pkgname=php-pdo-oci -pkgver=7.1.1 +pkgver=7.2.9 pkgrel=1 _extname=pdo_oci pkgdesc="PDO driver for OCI8" diff --git a/patch.diff b/patch.diff index 5cf902b7c651..121dfd0f04d0 100644 --- a/patch.diff +++ b/patch.diff @@ -1,21 +1,20 @@ ---- config.m4 2017-01-17 23:42:56.000000000 +0300 -+++ config_my.m4 2017-01-19 11:36:07.777725000 +0300 -@@ -101,6 +101,9 @@ - elif test -f $PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include/oci.h ; then - PHP_ADD_INCLUDE($PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include) - AC_MSG_RESULT($PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include) -+ elif test -f $PDO_OCI_IC_PREFIX/include/oci.h ; then -+ PHP_ADD_INCLUDE($PDO_OCI_IC_PREFIX/include) -+ AC_MSG_RESULT($PDO_OCI_IC_PREFIX/include) - else - AC_MSG_ERROR([I'm too dumb to figure out where the include dir is in your Instant Client install]) - fi -@@ -110,6 +113,8 @@ - PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/lib" - elif test -f "$PDO_OCI_IC_PREFIX/libclntsh.$SHLIB_SUFFIX_NAME" ; then - PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX" -+ elif test -f "$PDO_OCI_IC_PREFIX/lib/libclntsh.$SHLIB_SUFFIX_NAME" ; then -+ PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/lib" - else - AC_MSG_ERROR([I'm too dumb to figure out where the libraries are in your Instant Client install]) - fi +--- config-orig.m4 2018-08-14 17:01:54.000000000 +0300 ++++ config.m4 2018-09-04 17:57:44.525777935 +0300 +@@ -17,7 +17,7 @@ + + AC_DEFUN([AC_PDO_OCI_VERSION],[ + AC_MSG_CHECKING([Oracle version]) +- PDO_OCI_LCS_BASE=$PDO_OCI_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME ++ PDO_OCI_LCS_BASE=$PDO_OCI_LIB_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME + PDO_OCI_LCS=`ls $PDO_OCI_LCS_BASE.*.1 2> /dev/null | $PHP_PDO_OCI_TAIL1` # Oracle 10g, 11g, 12c etc + if test -f "$PDO_OCI_LCS"; then + dnl Oracle 10g, 11g 12c etc. The x.2 version libraries are named x.1 for drop in compatibility +@@ -99,7 +99,7 @@ + OCISDKMANINC=`echo "$PDO_OCI_LIB_DIR" | $PHP_PDO_OCI_SED -e 's!^\(.*\)/lib[/]*$!\1/include!'` + + dnl Header directory for Instant Client SDK zip file install +- OCISDKZIPINC=$PDO_OCI_LIB_DIR/sdk/include ++ OCISDKZIPINC=$PDO_OCI_LIB_DIR/include + + + if test -f "$OCISDKRPMINC/oci.h" ; then |