Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 53886 | Differences between
and this patch

Collapse All | Expand All

(-)php5-sapi.eclass.orig (-15 / +4 lines)
Lines 48-53 Link Here
48
	ming? ( media-libs/ming )
48
	ming? ( media-libs/ming )
49
	mssql? ( dev-db/freetds )
49
	mssql? ( dev-db/freetds )
50
	mysql? ( >=dev-db/mysql-3.23.26 )
50
	mysql? ( >=dev-db/mysql-3.23.26 )
51
	mysqli? ( >=dev-db/mysql-4.1.3 )
51
	ncurses? ( sys-libs/ncurses )
52
	ncurses? ( sys-libs/ncurses )
52
	nls? ( sys-devel/gettext )
53
	nls? ( sys-devel/gettext )
53
	odbc? ( >=dev-db/unixODBC-1.8.13 )
54
	odbc? ( >=dev-db/unixODBC-1.8.13 )
Lines 106-121 Link Here
106
107
107
php5-sapi_check_awkward_uses () {
108
php5-sapi_check_awkward_uses () {
108
109
109
	# mysqli support isn't possible yet
110
111
	if useq mysqli ; then
112
		eerror
113
		eerror "We currently do not support the mysqli extension"
114
		eerror "Support will be added once MySQL 4.1 has been added to Portage"
115
		eerror
116
		die "mysqli not supported yet"
117
	fi
118
119
	# recode not available in 5.0.0; upstream bug
110
	# recode not available in 5.0.0; upstream bug
120
	if useq recode && [ "$PV" == "5.0.0" ]; then
111
	if useq recode && [ "$PV" == "5.0.0" ]; then
121
		eerror
112
		eerror
Lines 219-227 Link Here
219
	fi
210
	fi
220
211
221
	if useq mysql ; then
212
	if useq mysql ; then
222
		enable_extension_with		"mysql"			"mysql"			1
213
		enable_extension_with		"mysql"			"mysql"			1 "/usr"
223
		enable_extension_with		"mysql-sock"	"mysql"			0 "/var/run/mysqld/mysqld.sock"
214
		enable_extension_with		"mysql-sock"	"mysql"			0 "/var/run/mysqld/mysqld.sock"
224
	else
215
	fi
216
	if useq mysqli ; then
225
		enable_extension_with		"mysqli"		"mysqli"			1
217
		enable_extension_with		"mysqli"		"mysqli"			1
226
	fi
218
	fi
227
219
Lines 264-272 Link Here
264
	# ldap support
256
	# ldap support
265
	confutils_use_depend_all "sasl" "ldap"
257
	confutils_use_depend_all "sasl" "ldap"
266
258
267
	# mysql support
268
	confutils_use_conflict "mysqli" "mysql"
269
270
	# odbc support
259
	# odbc support
271
	confutils_use_depend_all "adabas"		"odbc"
260
	confutils_use_depend_all "adabas"		"odbc"
272
	confutils_use_depend_all "birdstep"		"odbc"
261
	confutils_use_depend_all "birdstep"		"odbc"

Return to bug 53886