Attachment #53792 for bug #81382

View | Details | Raw Unified | Return to bug 81382
Collapse All | Expand All




.endif

.if ${PHP_MODNAME} == "oracle"
USE_REINPLACE=	yes
BUILD_DEPENDS+=	${LOCALBASE}/oracle7/lib/libcore3.a:${PORTSDIR}/databases/oracle7-client
RUN_DEPENDS+=	${LOCALBASE}/oracle7/lib/libcore3.a:${PORTSDIR}/databases/oracle7-client


.if ${PHP_MODNAME} == "zlib"
post-extract:
	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
.endif

.if ${PHP_MODNAME} == "oracle"
post-patch:
	@${REINPLACE_CMD} -e "s|LIBORACLE7_DIR|${WRKDIR}|" ${WRKSRC}/config.m4

pre-configure:
	@cd ${WRKDIR}; \
	for lib in c3v6 client common core3 epc generic ncr nlsrtl3 sqlnet wrap; do \
		/usr/bin/ar x ${LOCALBASE}/oracle7/lib/lib$${lib}.a; \
	done; \
	/usr/bin/ar rcs liboracle7.a *.o
.endif




--- config.m4.orig	Thu Dec 30 08:04:11 2004
+++ config.m4	Sat May 21 23:06:02 2005
@@ -4,8 +4,8 @@
 
 AC_DEFUN([AC_ORACLE_VERSION],[
   AC_MSG_CHECKING([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.9.0; then
     ORACLE_VERSION=9.0
@@ -112,25 +112,7 @@
 	  if test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME; then
 	    PHP_ADD_LIBRARY_WITH_PATH(clntsh, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
 	  else
-	    PHP_ADD_LIBRARY_WITH_PATH(core3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
-	    PHP_ADD_LIBRARY_WITH_PATH(nlsrtl3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
-	    PHP_ADD_LIBRARY_WITH_PATH(core3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
-	    PHP_ADD_LIBRARY_WITH_PATH(c3v6, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
-	    PHP_ADD_LIBRARY_WITH_PATH(nlsrtl3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
-	    PHP_ADD_LIBRARY_WITH_PATH(epc, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
-	    PHP_ADD_LIBRARY_WITH_PATH(generic, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
-	    PHP_ADD_LIBRARY_WITH_PATH(common, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
-	    PHP_ADD_LIBRARY_WITH_PATH(client, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
-	    PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
-	    PHP_ADD_LIBRARY_WITH_PATH(ncr, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
-	    PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
-	    PHP_ADD_LIBRARY_WITH_PATH(generic, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
-	    PHP_ADD_LIBRARY_WITH_PATH(common, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
-	    PHP_ADD_LIBRARY_WITH_PATH(client, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
-	    PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
-	    PHP_ADD_LIBRARY_WITH_PATH(ncr, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
-	    PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
-	    PHP_ADD_LIBRARY_WITH_PATH(client, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
+	    PHP_ADD_LIBRARY_WITH_PATH(oracle7, LIBORACLE7_DIR, ORACLE_SHARED_LIBADD)
 	  fi
 	  ;;


Return to bug 81382

Lines 237-242 Link Here

(-)lang/php5/Makefile.ext (+13 lines)
237	.endif	237	.endif
238		238
239	.if ${PHP_MODNAME} == "oracle"	239	.if ${PHP_MODNAME} == "oracle"
		240	USE_REINPLACE= yes
240	BUILD_DEPENDS+= ${LOCALBASE}/oracle7/lib/libcore3.a:${PORTSDIR}/databases/oracle7-client	241	BUILD_DEPENDS+= ${LOCALBASE}/oracle7/lib/libcore3.a:${PORTSDIR}/databases/oracle7-client
241	RUN_DEPENDS+= ${LOCALBASE}/oracle7/lib/libcore3.a:${PORTSDIR}/databases/oracle7-client	242	RUN_DEPENDS+= ${LOCALBASE}/oracle7/lib/libcore3.a:${PORTSDIR}/databases/oracle7-client
242		243
Lines 481-484 Link Here
481	.if ${PHP_MODNAME} == "zlib"	482	.if ${PHP_MODNAME} == "zlib"
482	post-extract:	483	post-extract:
483	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4	484	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
		485	.endif
		486
		487	.if ${PHP_MODNAME} == "oracle"
		488	post-patch:
		489	@${REINPLACE_CMD} -e "s\|LIBORACLE7_DIR\|${WRKDIR}\|" ${WRKSRC}/config.m4
		490
		491	pre-configure:
		492	@cd ${WRKDIR}; \
		493	for lib in c3v6 client common core3 epc generic ncr nlsrtl3 sqlnet wrap; do \
		494	/usr/bin/ar x ${LOCALBASE}/oracle7/lib/lib$${lib}.a; \
		495	done; \
		496	/usr/bin/ar rcs liboracle7.a *.o
484	.endif	497	.endif

Lines 1-8 Link Here

(-)databases/php5-oracle/files/patch-config.m4 (-9 / +28 lines)
1	--- config.m4.orig Thu Jul 8 10:22:35 2004	1	--- config.m4.orig Thu Dec 30 08:04:11 2004
2	+++ config.m4 Thu Jul 8 10:30:31 2004	2	+++ config.m4 Sat May 21 23:06:02 2005
3	@@ -4,8 +4,8 @@	3	@@ -4,8 +4,8 @@
4		4
5	AC_DEFUN(AC_ORACLE_VERSION,[	5	AC_DEFUN([AC_ORACLE_VERSION],[
6	AC_MSG_CHECKING([Oracle version])	6	AC_MSG_CHECKING([Oracle version])
7	- if test -s "$ORACLE_DIR/orainst/unix.rgs"; then	7	- if test -s "$ORACLE_DIR/orainst/unix.rgs"; then
8	- ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs \| sed 's/[ ][ ]*/:/g' \| cut -d: -f 6 \| cut -c 2-4`	8	- ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs \| sed 's/[ ][ ]*/:/g' \| cut -d: -f 6 \| cut -c 2-4`
Lines 11-21 Link Here
11	test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3	11	test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3
12	elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then	12	elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
13	ORACLE_VERSION=9.0	13	ORACLE_VERSION=9.0
14	@@ -113,6 +113,7 @@	14	@@ -112,25 +112,7 @@
		15	if test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME; then
15	PHP_ADD_LIBRARY_WITH_PATH(clntsh, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)	16	PHP_ADD_LIBRARY_WITH_PATH(clntsh, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
16	else	17	else
17	PHP_ADD_LIBRARY_WITH_PATH(core3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)	18	- PHP_ADD_LIBRARY_WITH_PATH(core3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
18	+ PHP_ADD_LIBRARY_WITH_PATH(wrap, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)	19	- PHP_ADD_LIBRARY_WITH_PATH(nlsrtl3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
19	PHP_ADD_LIBRARY_WITH_PATH(nlsrtl3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)	20	- PHP_ADD_LIBRARY_WITH_PATH(core3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
20	PHP_ADD_LIBRARY_WITH_PATH(core3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)	21	- PHP_ADD_LIBRARY_WITH_PATH(c3v6, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
21	PHP_ADD_LIBRARY_WITH_PATH(c3v6, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)	22	- PHP_ADD_LIBRARY_WITH_PATH(nlsrtl3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
		23	- PHP_ADD_LIBRARY_WITH_PATH(epc, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
		24	- PHP_ADD_LIBRARY_WITH_PATH(generic, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
		25	- PHP_ADD_LIBRARY_WITH_PATH(common, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
		26	- PHP_ADD_LIBRARY_WITH_PATH(client, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
		27	- PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
		28	- PHP_ADD_LIBRARY_WITH_PATH(ncr, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
		29	- PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
		30	- PHP_ADD_LIBRARY_WITH_PATH(generic, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
		31	- PHP_ADD_LIBRARY_WITH_PATH(common, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
		32	- PHP_ADD_LIBRARY_WITH_PATH(client, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
		33	- PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
		34	- PHP_ADD_LIBRARY_WITH_PATH(ncr, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
		35	- PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
		36	- PHP_ADD_LIBRARY_WITH_PATH(client, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
		37	+ PHP_ADD_LIBRARY_WITH_PATH(oracle7, LIBORACLE7_DIR, ORACLE_SHARED_LIBADD)
		38	fi
		39	;;
		40