diff options
author | grant <grant@pkgsrc.org> | 2007-03-11 16:43:49 +0000 |
---|---|---|
committer | grant <grant@pkgsrc.org> | 2007-03-11 16:43:49 +0000 |
commit | 27e8036ff1294be0c71bfd3131bf5acbf992dd24 (patch) | |
tree | 70472706680ed51589d6bb7d9e14ee43a3325f6d | |
parent | c8ec7f8bf5231c6ad078d2acb2477cf324c8f571 (diff) | |
download | pkgsrc-27e8036ff1294be0c71bfd3131bf5acbf992dd24.tar.gz |
patch to allow the Oracle extension to be built against Oracle 10.1
libraries. no PKGREVISION bump as the module is not built by default.
needed for upcoming new php-oracle package.
-rw-r--r-- | www/php4/distinfo | 3 | ||||
-rw-r--r-- | www/php4/patches/patch-au | 22 |
2 files changed, 24 insertions, 1 deletions
diff --git a/www/php4/distinfo b/www/php4/distinfo index b9c6c8b9f24..d1541c57d61 100644 --- a/www/php4/distinfo +++ b/www/php4/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.61 2007/03/03 13:19:53 adrianp Exp $ +$NetBSD: distinfo,v 1.62 2007/03/11 16:43:49 grant Exp $ SHA1 (php-4.4.6.tar.bz2) = e9c11ae084e2d505568d672afd06d4e6fc431621 RMD160 (php-4.4.6.tar.bz2) = 16a81ee94d1f8f56adf3e76dde32c62597130674 @@ -16,3 +16,4 @@ SHA1 (patch-al) = 28ad9006b387e2b9984ad49beea21c9d46e63b46 SHA1 (patch-ao) = 0fd4becf023451ac8cb185df354830efc86c1344 SHA1 (patch-ap) = 2f852abd1e9d0f089add18b2eade2831253ad00e SHA1 (patch-at) = f8b3aebd61fe2d5b5a994e1d973424a1ed397f63 +SHA1 (patch-au) = f9798aa440e174f65dde574c4f3b28183b3d18bc diff --git a/www/php4/patches/patch-au b/www/php4/patches/patch-au new file mode 100644 index 00000000000..3847b0834b8 --- /dev/null +++ b/www/php4/patches/patch-au @@ -0,0 +1,22 @@ +$NetBSD: patch-au,v 1.5 2007/03/11 16:43:49 grant Exp $ + +--- ext/oracle/config.m4.orig 2004-12-30 18:02:18.000000000 +1100 ++++ ext/oracle/config.m4 +@@ -7,6 +7,8 @@ AC_DEFUN([AC_ORACLE_VERSION],[ + if test -s "$ORACLE_DIR/orainst/unix.rgs"; then + ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs | sed 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4` + test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3 ++ elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then ++ ORACLE_VERSION=10.1 + elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then + ORACLE_VERSION=9.0 + elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then +@@ -141,7 +143,7 @@ if test "$PHP_ORACLE" != "no"; then + PHP_ADD_LIBRARY_WITH_PATH(clntsh, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + ;; + +- 8.1|9.0) ++ 8.1|9.0|10.1) + PHP_ADD_LIBRARY(clntsh, 1, ORACLE_SHARED_LIBADD) + PHP_ADD_LIBPATH($ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) + ;; |