Attachment #31948 for bug #53017

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




ALL_OPTIONS=	BCMATH BZIP2 CALENDAR CRACK CTYPE CURL DBASE DBX DOMXML \
		DOMXSLT EXIF FILEPRO FTP GD GDBM GETTEXT GMP HYPERWAVE ICONV \
		IMAP INTERBASE MBSTRING MCAL MCVE MCRYPT MHASH MIME MING MYSQL \
		NCURSES OPENLDAP OPENSSL ORACLE PCNTL PCRE PDFLIB POSIX \
		POSTGRESQL PSPELL READLINE RECODE SESSION SHMOP SNMP SOCKETS \
		SYBASEDB SYBASECT SYSVSEM SYSVSHM TOKENIZER UNIXODBC WDDX XML \
		XMLRPC XSLT YAZ YP ZIP ZLIB

.for opt in ${ALL_OPTIONS}
.if defined(WITH_${opt}) || defined(WITHOUT_${opt})


.if defined(WITH_CRACK)
BUILD_DEPENDS+=	${LOCALBASE}/lib/libcrack.a:${PORTSDIR}/security/cracklib
RUN_DEPENDS+=	${LOCALBASE}/lib/libcrack.a:${PORTSDIR}/security/cracklib
CONFIGURE_ARGS+=--with-crack=${LOCALBASE}
.endif



.if defined(WITH_OPENSSL)
CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
.endif

.if defined(WITH_ORACLE)
BUILD_DEPENDS+=	${LOCALBASE}/oracle7/lib/libcore3.a:${PORTSDIR}/databases/oracle7-client
RUN_DEPENDS+=	${LOCALBASE}/oracle7/lib/libcore3.a:${PORTSDIR}/databases/oracle7-client
CONFIGURE_ARGS+=--with-oracle=${LOCALBASE}/oracle7
.endif

.if defined(WITH_PCNTL)




--- configure.orig	Wed May 28 14:36:29 2003
+++ configure	Sat Jun  7 15:37:45 2003
@@ -54106,8 +54106,8 @@
   
   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`
+  if test -s "$ORACLE_DIR/ocommon/install/partial.prd"; then
+  	ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/ocommon/install/partial.prd | 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
@@ -56370,6 +56370,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="-lnlsrtl3 $ORACLE_SHARED_LIBADD"
     if test -n "$ORACLE_DIR/lib"; then
       
@@ -70911,29 +71007,6 @@
   else
     
   

   case ct in
   c|c_r|pthread*) ;;
   *) 
@@ -70957,52 +71030,7 @@
 
     
   

   
     
   save_old_LDFLAGS=$LDFLAGS
@@ -71072,37 +71100,6 @@
 
     
   

 fi
 
   
@@ -84033,10 +84030,7 @@
 CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
 
 all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'

Lines 50-55 Link Here

(-)php4/scripts/configure.php (+1 lines)
50	NCURSES "ncurses support (CLI only)" ${WITH_NCURSES:-OFF} \	50	NCURSES "ncurses support (CLI only)" ${WITH_NCURSES:-OFF} \
51	OPENLDAP "OpenLDAP support" ${WITH_OPENLDAP:-OFF} \	51	OPENLDAP "OpenLDAP support" ${WITH_OPENLDAP:-OFF} \
52	OPENSSL "OpenSSL support" ${WITH_OPENSSL:-OFF} \	52	OPENSSL "OpenSSL support" ${WITH_OPENSSL:-OFF} \
		53	ORACLE "Oracle support" ${WITH_ORACLE:-OFF} \
53	PCNTL "pcntl support (CLI only)" ${WITH_PCNTL:-OFF} \	54	PCNTL "pcntl support (CLI only)" ${WITH_PCNTL:-OFF} \
54	PCRE "Perl Compatible Regular Expression support" ${WITH_PCRE:-OFF} \	55	PCRE "Perl Compatible Regular Expression support" ${WITH_PCRE:-OFF} \
55	PDFLIB "PDFlib support" ${WITH_PDFLIB:-OFF} \	56	PDFLIB "PDFlib support" ${WITH_PDFLIB:-OFF} \

Lines 30-35 Link Here

(-)php4/scripts/php_options (+1 lines)
30	WITH_NCURSES=OFF	30	WITH_NCURSES=OFF
31	WITH_OPENLDAP=OFF	31	WITH_OPENLDAP=OFF
32	WITH_OPENSSL=OFF	32	WITH_OPENSSL=OFF
		33	WITH_ORACLE=OFF
33	WITH_PCNTL=OFF	34	WITH_PCNTL=OFF
34	WITH_PCRE=ON	35	WITH_PCRE=ON
35	WITH_PDFLIB=OFF	36	WITH_PDFLIB=OFF

Return to bug 53017

Lines 105-114 Link Here

(-)php4/Makefile (-4 / +11 lines)
105	ALL_OPTIONS= BCMATH BZIP2 CALENDAR CRACK CTYPE CURL DBASE DBX DOMXML \	105	ALL_OPTIONS= BCMATH BZIP2 CALENDAR CRACK CTYPE CURL DBASE DBX DOMXML \
106	DOMXSLT EXIF FILEPRO FTP GD GDBM GETTEXT GMP HYPERWAVE ICONV \	106	DOMXSLT EXIF FILEPRO FTP GD GDBM GETTEXT GMP HYPERWAVE ICONV \
107	IMAP INTERBASE MBSTRING MCAL MCVE MCRYPT MHASH MIME MING MYSQL \	107	IMAP INTERBASE MBSTRING MCAL MCVE MCRYPT MHASH MIME MING MYSQL \
108	NCURSES OPENLDAP OPENSSL PCNTL PCRE PDFLIB POSIX POSTGRESQL \	108	NCURSES OPENLDAP OPENSSL ORACLE PCNTL PCRE PDFLIB POSIX \
109	PSPELL READLINE RECODE SESSION SHMOP SNMP SOCKETS SYBASEDB \	109	POSTGRESQL PSPELL READLINE RECODE SESSION SHMOP SNMP SOCKETS \
110	SYBASECT SYSVSEM SYSVSHM TOKENIZER UNIXODBC WDDX XML XMLRPC \	110	SYBASEDB SYBASECT SYSVSEM SYSVSHM TOKENIZER UNIXODBC WDDX XML \
111	XSLT YAZ YP ZIP ZLIB	111	XMLRPC XSLT YAZ YP ZIP ZLIB
112		112
113	.for opt in ${ALL_OPTIONS}	113	.for opt in ${ALL_OPTIONS}
114	.if defined(WITH_${opt}) \|\| defined(WITHOUT_${opt})	114	.if defined(WITH_${opt}) \|\| defined(WITHOUT_${opt})
Lines 224-229 Link Here
224		224
225	.if defined(WITH_CRACK)	225	.if defined(WITH_CRACK)
226	BUILD_DEPENDS+= ${LOCALBASE}/lib/libcrack.a:${PORTSDIR}/security/cracklib	226	BUILD_DEPENDS+= ${LOCALBASE}/lib/libcrack.a:${PORTSDIR}/security/cracklib
		227	RUN_DEPENDS+= ${LOCALBASE}/lib/libcrack.a:${PORTSDIR}/security/cracklib
227	CONFIGURE_ARGS+=--with-crack=${LOCALBASE}	228	CONFIGURE_ARGS+=--with-crack=${LOCALBASE}
228	.endif	229	.endif
229		230
Lines 394-399 Link Here
394		395
395	.if defined(WITH_OPENSSL)	396	.if defined(WITH_OPENSSL)
396	CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}	397	CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
		398	.endif
		399
		400	.if defined(WITH_ORACLE)
		401	BUILD_DEPENDS+= ${LOCALBASE}/oracle7/lib/libcore3.a:${PORTSDIR}/databases/oracle7-client
		402	RUN_DEPENDS+= ${LOCALBASE}/oracle7/lib/libcore3.a:${PORTSDIR}/databases/oracle7-client
		403	CONFIGURE_ARGS+=--with-oracle=${LOCALBASE}/oracle7
397	.endif	404	.endif
398		405
399	.if defined(WITH_PCNTL)	406	.if defined(WITH_PCNTL)

Lines 1-6 Link Here

(-)php4/files/patch-configure (-6 / +120 lines)
1	--- configure.orig Thu May 1 23:30:59 2003	1	--- configure.orig Wed May 28 14:36:29 2003
2	+++ configure Fri May 2 15:59:58 2003	2	+++ configure Sat Jun 7 15:37:45 2003
3	@@ -70925,29 +70925,6 @@	3	@@ -54106,8 +54106,8 @@
		4
		5	echo $ac_n "checking Oracle version""... $ac_c" 1>&6
		6	echo "configure:54109: checking Oracle version" >&5
		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`
		9	+ if test -s "$ORACLE_DIR/ocommon/install/partial.prd"; then
		10	+ ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/ocommon/install/partial.prd \| sed 's/ */:/g' \| cut -d: -f 6 \| cut -c 2-4`
		11	test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3
		12	elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
		13	ORACLE_VERSION=9.0
		14	@@ -56370,6 +56370,102 @@
		15
		16
		17	if test "$ext_shared" = "yes"; then
		18	+ ORACLE_SHARED_LIBADD="-lwrap $ORACLE_SHARED_LIBADD"
		19	+ if test -n "$ORACLE_DIR/lib"; then
		20	+
		21	+ if test "$ORACLE_DIR/lib" != "/usr/lib"; then
		22	+
		23	+ if test -z "$ORACLE_DIR/lib" \|\| echo "$ORACLE_DIR/lib" \| grep '^/' >/dev/null ; then
		24	+ ai_p=$ORACLE_DIR/lib
		25	+ else
		26	+
		27	+ ep_dir="`echo $ORACLE_DIR/lib\|sed 's%/[^/][^/]/*$%%'`"
		28	+
		29	+ ep_realdir="`(cd \"$ep_dir\" && pwd)`"
		30	+ ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
		31	+ fi
		32	+
		33	+
		34	+ if test "$ext_shared" = "yes"; then
		35	+ ORACLE_SHARED_LIBADD="$ld_runpath_switch$ai_p -L$ai_p $ORACLE_SHARED_LIBADD"
		36	+ else
		37	+
		38	+
		39	+
		40	+ unique=`echo $ai_p\|sed 's/[^a-zA-Z0-9]/_/g'`
		41	+
		42	+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
		43	+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
		44	+ eval "LIBPATH$unique=set"
		45	+
		46	+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
		47	+ LDFLAGS="$LDFLAGS -L$ai_p"
		48	+ PHP_RPATHS="$PHP_RPATHS $ai_p"
		49	+
		50	+ fi
		51	+
		52	+
		53	+ fi
		54	+
		55	+ fi
		56	+
		57	+ fi
		58	+ else
		59	+
		60	+
		61	+ if test -n "$ORACLE_DIR/lib"; then
		62	+
		63	+ if test "$ORACLE_DIR/lib" != "/usr/lib"; then
		64	+
		65	+ if test -z "$ORACLE_DIR/lib" \|\| echo "$ORACLE_DIR/lib" \| grep '^/' >/dev/null ; then
		66	+ ai_p=$ORACLE_DIR/lib
		67	+ else
68	+
69	+ ep_dir="`echo $ORACLE_DIR/lib\|sed 's%/[^/][^/]/*$%%'`"
70	+
71	+ ep_realdir="`(cd \"$ep_dir\" && pwd)`"
72	+ ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
73	+ fi
74	+
75	+
76	+
77	+
78	+
79	+ unique=`echo $ai_p\|sed 's/[^a-zA-Z0-9]/_/g'`
80	+
81	+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
82	+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
83	+ eval "LIBPATH$unique=set"
84	+
85	+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
86	+ LDFLAGS="$LDFLAGS -L$ai_p"
87	+ PHP_RPATHS="$PHP_RPATHS $ai_p"
88	+
89	+ fi
90	+
91	+
92	+
93	+ fi
94	+
95	+ fi
96	+
97	+
98	+ case wrap in
99	+ c\|c_r\|pthread*) ;;
100	+ *)
101	+ LIBS="-lwrap $LIBS"
102	+ ;;
103	+ esac
104	+
105	+
106	+
107	+
108	+ fi
109	+
110	+
111	+
112	+
113	+ if test "$ext_shared" = "yes"; then
114	ORACLE_SHARED_LIBADD="-lnlsrtl3 $ORACLE_SHARED_LIBADD"
115	if test -n "$ORACLE_DIR/lib"; then
116
117	@@ -70911,29 +71007,6 @@
4	else	118	else
5		119
6		120
Lines 30-36 Link Here
30	case ct in	144	case ct in
31	c\|c_r\|pthread*) ;;	145	c\|c_r\|pthread*) ;;
32	*)	146	*)
33	@@ -70971,52 +70948,7 @@	147	@@ -70957,52 +71030,7 @@
34		148
35		149
36		150
Lines 84-90 Link Here
84		198
85		199
86	save_old_LDFLAGS=$LDFLAGS	200	save_old_LDFLAGS=$LDFLAGS
87	@@ -71086,37 +71018,6 @@	201	@@ -71072,37 +71100,6 @@
88		202
89		203
90		204
Lines 122-128 Link Here
122	fi	236	fi
123		237
124		238
125	@@ -84050,10 +83951,7 @@	239	@@ -84033,10 +84030,7 @@
126	CXXFLAGS="$CXXFLAGS $standard_libtool_flag"	240	CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
127		241
128	all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'	242	all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'