Date: 23 May 2003 15:51:01 -0000 From: Joe Kelsey <joek@zircon.staff.flyingcroc.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/52615: Add Oracle support to PHP4 Message-ID: <20030523155101.81215.qmail@zircon.staff.flyingcroc.net> Resent-Message-ID: <200305231600.h4NG0Lkx006047@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 52615
>Category: ports
>Synopsis: Add Oracle support to PHP4
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri May 23 09:00:21 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Joe Kelsey
>Release: FreeBSD 4.8-STABLE i386
>Organization:
>Environment:
System: FreeBSD zircon.staff.flyingcroc.net 4.8-STABLE FreeBSD 4.8-STABLE #9: Thu Apr 10 12:37:52 PDT 2003 joek@zircon.staff.flyingcroc.net:/usr/obj/usr/src/sys/ZIRCON i386
>Description:
Add oracle support to php4 using databases/oracle7 port.
>How-To-Repeat:
See PR ports/44796, an attempt to add oracle support earlier.
The fix below takes into account the recent changes.
>Fix:
lang/php4/Makefile:
--- Makefile.orig Fri May 23 08:45:06 2003
+++ Makefile Fri May 23 07:44:23 2003
@@ -343,6 +343,11 @@
CONFIGURE_ARGS+=--with-ncurses=${NCURSESBASE}
.endif
+.if defined(WITH_ORACLE)
+BUILD_DEPENDS+= ${LOCALBASE}/oracle7/rdbms/demo/oracle.mk:${PORTSDIR}/databases/oracle7-client
+CONFIGURE_ARGS+=--with-oracle=$(LOCALBASE)/oracle7
+.endif
+
.if defined(WITH_OPENLDAP)
.if exists(${LOCALBASE}/lib/libldap.so.1)
LIB_DEPENDS+= ldap.1:${PORTSDIR}/net/openldap12
lang/php4/files/patch-configure:
--- configure.orig Wed May 21 17:25:40 2003
+++ configure Fri May 23 08:31:39 2003
@@ -54106,24 +54106,7 @@
echo $ac_n "checking Oracle version""... $ac_c" 1>&6
echo "configure:54109: checking Oracle version" >&5
- 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
- elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then
- ORACLE_VERSION=8.1
- elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.1.0; then
- ORACLE_VERSION=8.0
- elif test -f $ORACLE_DIR/lib/libclntsh.a; then
- if test -f $ORACLE_DIR/lib/libcore4.a; then
- ORACLE_VERSION=8.0
- else
- ORACLE_VERSION=8.1
- fi
- else
- { echo "configure: error: Oracle needed libraries not found" 1>&2; exit 1; }
- fi
+ ORACLE_VERSION=7.3
echo "$ac_t""$ORACLE_VERSION" 1>&6
case $ORACLE_VERSION in
@@ -55303,6 +55286,102 @@
if test "$ext_shared" = "yes"; then
+ ORACLE_SHARED_LIBADD="-lwrap $ORACLE_SHARED_LIBADD"
+ if test -n "$ORACLE_DIR/lib"; then
+
+ if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+
+ if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
+ ai_p=$ORACLE_DIR/lib
+ else
+
+ ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+
+ ep_realdir="`(cd \"$ep_dir\" && pwd)`"
+ ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+ fi
+
+
+ if test "$ext_shared" = "yes"; then
+ ORACLE_SHARED_LIBADD="$ld_runpath_switch$ai_p -L$ai_p $ORACLE_SHARED_LIBADD"
+ else
+
+
+
+ unique=`echo $ai_p|sed 's/[^a-zA-Z0-9]/_/g'`
+
+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
+ eval "LIBPATH$unique=set"
+
+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
+ LDFLAGS="$LDFLAGS -L$ai_p"
+ PHP_RPATHS="$PHP_RPATHS $ai_p"
+
+ fi
+
+
+ fi
+
+ fi
+
+ fi
+ else
+
+
+ if test -n "$ORACLE_DIR/lib"; then
+
+ if test "$ORACLE_DIR/lib" != "/usr/lib"; then
+
+ if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
+ ai_p=$ORACLE_DIR/lib
+ else
+
+ ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
+
+ ep_realdir="`(cd \"$ep_dir\" && pwd)`"
+ ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
+ fi
+
+
+
+
+
+ unique=`echo $ai_p|sed 's/[^a-zA-Z0-9]/_/g'`
+
+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
+ eval "LIBPATH$unique=set"
+
+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
+ LDFLAGS="$LDFLAGS -L$ai_p"
+ PHP_RPATHS="$PHP_RPATHS $ai_p"
+
+ fi
+
+
+
+ fi
+
+ fi
+
+
+ case wrap in
+ c|c_r|pthread*) ;;
+ *)
+ LIBS="-lwrap $LIBS"
+ ;;
+ esac
+
+
+
+
+ fi
+
+
+
+
+ if test "$ext_shared" = "yes"; then
ORACLE_SHARED_LIBADD="-lcore3 $ORACLE_SHARED_LIBADD"
if test -n "$ORACLE_DIR/lib"; then
@@ -70911,29 +70990,6 @@
else
- case cs in
- c|c_r|pthread*) ;;
- *)
- if test "$ext_shared" = "yes"; then
- SYBASE_CT_SHARED_LIBADD="-lcs $SYBASE_CT_SHARED_LIBADD"
- else
-
-
- case cs in
- c|c_r|pthread*) ;;
- *)
- LIBS="-lcs $LIBS"
- ;;
- esac
-
-
- fi
- ;;
- esac
-
-
-
-
case ct in
c|c_r|pthread*) ;;
*)
@@ -70957,52 +71013,7 @@
- case comn in
- c|c_r|pthread*) ;;
- *)
- if test "$ext_shared" = "yes"; then
- SYBASE_CT_SHARED_LIBADD="-lcomn $SYBASE_CT_SHARED_LIBADD"
- else
-
-
- case comn in
- c|c_r|pthread*) ;;
- *)
- LIBS="-lcomn $LIBS"
- ;;
- esac
-
-
- fi
- ;;
- esac
-
-
-
-
- case intl in
- c|c_r|pthread*) ;;
- *)
- if test "$ext_shared" = "yes"; then
- SYBASE_CT_SHARED_LIBADD="-lintl $SYBASE_CT_SHARED_LIBADD"
- else
-
-
- case intl in
- c|c_r|pthread*) ;;
- *)
- LIBS="-lintl $LIBS"
- ;;
- esac
-
-
- fi
- ;;
- esac
-
-
-
- SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl"
+ SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct"
save_old_LDFLAGS=$LDFLAGS
@@ -71072,37 +71083,6 @@
-else
- echo "$ac_t""no" 1>&6
-
- LDFLAGS=$save_old_LDFLAGS
- unset ac_cv_func_tcl
-
-
-
- case sybtcl in
- c|c_r|pthread*) ;;
- *)
- if test "$ext_shared" = "yes"; then
- SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD"
- else
-
-
- case sybtcl in
- c|c_r|pthread*) ;;
- *)
- LIBS="-lsybtcl $LIBS"
- ;;
- esac
-
-
- fi
- ;;
- esac
-
-
-
-
fi
@@ -83989,7 +83969,7 @@
# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+LIBTOOL_DEPS="--disable-ltlibs /usr/local/share/libtool/ltmain.sh"
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -84033,10 +84013,7 @@
CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
-install_targets="install-sapi install-modules $install_pear install-build install-headers install-programs"
-if test "$PHP_SAPI" != "cgi"; then
- install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
-fi
+install_targets="install-sapi $PHP_INSTALL_CLI_TARGET install-modules $install_pear install-build install-headers install-programs"
PHP_VAR_SUBST="$PHP_VAR_SUBST all_targets"
lang/php4/scripts/php_options.diff:
--- php_options.orig Thu May 22 11:26:28 2003
+++ php_options Fri May 23 07:52:36 2003
@@ -30,6 +30,7 @@
WITH_NCURSES=OFF
WITH_OPENLDAP=OFF
WITH_OPENSSL=OFF
+WITH_ORACLE=OFF
WITH_PCNTL=OFF
WITH_PCRE=ON
WITH_PDFLIB=OFF
lang/php4/scripts/configure.php.diff:
--- configure.php.orig Thu May 22 11:26:28 2003
+++ configure.php Fri May 23 07:52:30 2003
@@ -50,6 +50,7 @@
NCURSES "ncurses support (CLI only)" ${WITH_NCURSES:-OFF} \
OPENLDAP "OpenLDAP support" ${WITH_OPENLDAP:-OFF} \
OPENSSL "OpenSSL support" ${WITH_OPENSSL:-OFF} \
+ORACLE "Oracle 7 support" $(WITH_ORACLE:-OFF) \
PCNTL "pcntl support (CLI only)" ${WITH_PCNTL:-OFF} \
PCRE "Perl Compatible Regular Expression support" ${WITH_PCRE:-OFF} \
PDFLIB "PDFlib support" ${WITH_PDFLIB:-OFF} \
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030523155101.81215.qmail>