packages: php/php.spec, php/php-oracle-instantclient.patch (NEW) - added in...

baggins baggins at pld-linux.org
Fri Sep 10 21:15:15 CEST 2010 

Author: baggins                      Date: Fri Sep 10 19:15:15 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added instantclient bcond

---- Files affected:
packages/php:
   php.spec (1.896 -> 1.897) , php-oracle-instantclient.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.896 packages/php/php.spec:1.897
--- packages/php/php.spec:1.896	Fri Aug 27 18:22:36 2010
+++ packages/php/php.spec	Fri Sep 10 21:15:10 2010
@@ -30,6 +30,7 @@
 %bcond_with	fdf		# with FDF (PDF forms) module		(BR: proprietary lib)
 %bcond_with	interbase_inst	# use InterBase install., not Firebird	(BR: proprietary libs)
 %bcond_with	oci8		# with Oracle oci8 extension module	(BR: proprietary libs)
+%bcond_with	instantclient	# build Oracle oci8 extension module against oracle-instantclient package
 %bcond_with	system_gd	# with system gd (we prefer internal since it enables few more features)
 %bcond_with	litespeed	# build litespeed module
 %bcond_without	curl		# without CURL extension module
@@ -183,6 +184,7 @@
 Patch57:	bug-52448.patch
 Patch58:	bug-52533.patch
 Patch59:	%{name}-systzdata.patch
+Patch60:	%{name}-oracle-instantclient.patch
 URL:		http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:	Firebird-devel >= 1.0.2.908-2}}
 %{?with_pspell:BuildRequires:	aspell-devel >= 2:0.50.0}
@@ -232,6 +234,7 @@
 %{?with_gcov:BuildRequires:	lcov}
 %{?with_snmp:%{?with_tests:BuildRequires:	mibs-net-snmp}}
 %{?with_snmp:BuildRequires:	net-snmp-devel >= 5.0.7}
+%{?with_instantclient:BuildRequires:	oracle-instantclient-devel}
 BuildRequires:	pam-devel
 %{?with_pcre:BuildRequires:	pcre-devel >= 6.6}
 BuildRequires:	pkgconfig
@@ -1844,6 +1847,7 @@
 %patch57 -p1
 %patch58 -p1
 %patch59 -p1
+%patch60 -p1
 
 %if "%{pld_release}" != "ac"
 sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4
@@ -2018,7 +2022,7 @@
 %endif
 	--with-mysql-sock=/var/lib/mysql/mysql.sock \
 	--with-pdo-mysql=shared%{?with_mysqlnd:,mysqlnd} \
-	%{?with_oci8:--with-pdo-oci=shared} \
+	%{?with_oci8:--with-pdo-oci=shared%{?with_instantclient:,instantclient,%{_libdir}}} \
 	%{?with_odbc:--with-pdo-odbc=shared,unixODBC,/usr} \
 	%{?with_pgsql:--with-pdo-pgsql=shared} \
 	%{?with_sqlite:--with-pdo-sqlite=shared,/usr} \
@@ -2061,7 +2065,7 @@
 	%{?with_mysqlnd:--with-mysqlnd=shared} \
 	--with-mysql=shared%{?with_mysqlnd:,mysqlnd} \
 	%{?with_mysqli:--with-mysqli=shared%{?with_mysqlnd:,mysqlnd}} \
-	%{?with_oci8:--with-oci8=shared} \
+	%{?with_oci8:--with-oci8=shared%{?with_instantclient:,instantclient,%{_libdir}}} \
 	%{?with_openssl:--with-openssl=shared} \
 	--with-kerberos \
 	%{__with_without pcre pcre-regex /usr} \
@@ -3157,6 +3161,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.897  2010/09/10 19:15:10  baggins
+- added instantclient bcond
+
 Revision 1.896  2010/08/27 16:22:36  glen
 - make phar link relative
 

================================================================
Index: packages/php/php-oracle-instantclient.patch
diff -u /dev/null packages/php/php-oracle-instantclient.patch:1.1
--- /dev/null	Fri Sep 10 21:15:16 2010
+++ packages/php/php-oracle-instantclient.patch	Fri Sep 10 21:15:10 2010
@@ -0,0 +1,63 @@
+--- php-5.3.3/ext/oci8/config.m4.orig	2010-06-25 23:18:09.000000000 +0200
++++ php-5.3.3/ext/oci8/config.m4	2010-09-10 19:37:23.484315002 +0200
+@@ -304,6 +304,9 @@
+ 
+     AC_MSG_CHECKING([Oracle Instant Client SDK header directory])
+ 
++    dnl Header directory for Instant Client SDK PLD RPM install
++    OCISDKPLDINC=$PHP_OCI8_INSTANT_CLIENT/../include/oracle/client
++
+     dnl Header directory for Instant Client SDK RPM install
+     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!'`
+ 
+@@ -313,7 +316,11 @@
+     dnl Header directory for manual installation
+     OCISDKMANINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!\(.*\)/lib[/]*$!\1/include!'`
+ 
+-    if test -f "$OCISDKRPMINC/oci.h"; then
++    if test -f "$OCISDKPLDINC/oci.h"; then
++      AC_MSG_RESULT($OCISDKPLDINC)
++      PHP_ADD_INCLUDE($OCISDKPLDINC)
++      OCI8INCDIR=$OCISDKPLDINC
++    elif test -f "$OCISDKRPMINC/oci.h"; then
+       AC_MSG_RESULT($OCISDKRPMINC)
+       PHP_ADD_INCLUDE($OCISDKRPMINC)
+       OCI8INCDIR=$OCISDKRPMINC
+--- php-5.3.3/ext/pdo_oci/config.m4~	2010-02-04 02:12:14.000000000 +0100
++++ php-5.3.3/ext/pdo_oci/config.m4	2010-09-10 19:58:31.206315023 +0200
+@@ -6,8 +6,10 @@
+ AC_DEFUN([AC_PDO_OCI_VERSION],[
+   AC_MSG_CHECKING([Oracle version])
+   for OCI_VER in $SUPPORTED_LIB_VERS; do
+-    if test -f $PDO_OCI_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.$OCI_VER; then
++    if test -f $1/lib/libclntsh.$SHLIB_SUFFIX_NAME.$OCI_VER; then
+       PDO_OCI_VERSION="$OCI_VER"
++    elif test -f $1/libclntsh.$SHLIB_SUFFIX_NAME.$OCI_VER; then
++      PDO_OCI_VERSION="$OCI_VER"
+     fi
+   done
+   if test -z "$PDO_OCI_VERSION"; then
+@@ -86,6 +86,9 @@
+     elif test -f $PDO_OCI_IC_PREFIX/client/include/oci.h ; then
+       PHP_ADD_INCLUDE($PDO_OCI_IC_PREFIX/client/include)
+       AC_MSG_RESULT($PDO_OCI_IC_PREFIX/client/include)
++    elif test -f $PDO_OCI_IC_PREFIX/../include/oracle/client/oci.h ; then
++      PHP_ADD_INCLUDE($PDO_OCI_IC_PREFIX/../include/oracle/client)
++      AC_MSG_RESULT($PDO_OCI_IC_PREFIX/../include/oracle/client)
+     else
+       AC_MSG_ERROR([I'm too dumb to figure out where the include dir is in your Instant Client install])
+     fi
+@@ -103,7 +103,12 @@
+     else
+       AC_MSG_ERROR([I'm too dumb to figure out where the libraries are in your Instant Client install])
+     fi
+-    PDO_OCI_VERSION="`echo $PDO_OCI_IC_VERS | cut -d. -f1-2`"
++    __PDO_OCI_VERSION="`echo $PDO_OCI_IC_VERS | cut -d. -f1-2`"
++    if test -n "$__PDO_OCI_VERSION" ; then
++      PDO_OCI_VERSION=$__PDO_OCI_VERSION
++    else
++      AC_PDO_OCI_VERSION($PDO_OCI_IC_PREFIX)
++    fi
+   else
+     AC_PDO_OCI_CHECK_LIB_DIR($PDO_OCI_DIR)
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.896&r2=1.897&f=u

More information about the pld-cvs-commit mailing list