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 / +5 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.2 )
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 218-226 Link Here
218
	fi
209
	fi
219
210
220
	if useq mysql ; then
211
	if useq mysql ; then
221
		enable_extension_with		"mysql"			"mysql"			1
212
		enable_extension_with		"mysql=/usr"	"mysql"			1
222
		enable_extension_with		"mysql-sock"	"mysql"			0 "/var/run/mysqld/mysqld.sock"
213
		enable_extension_with		"mysql-sock"	"mysql"			0 "/var/run/mysqld/mysqld.sock"
223
	else
214
	fi
215
216
	if useq mysqli ; then
224
		enable_extension_with		"mysqli"		"mysqli"			1
217
		enable_extension_with		"mysqli"		"mysqli"			1
225
	fi
218
	fi
226
219
Lines 263-271 Link Here
263
	# ldap support
256
	# ldap support
264
	confutils_use_depend_all "sasl" "ldap"
257
	confutils_use_depend_all "sasl" "ldap"
265
258
266
	# mysql support
267
	confutils_use_conflict "mysqli" "mysql"
268
269
	# odbc support
259
	# odbc support
270
	confutils_use_depend_all "adabas"		"odbc"
260
	confutils_use_depend_all "adabas"		"odbc"
271
	confutils_use_depend_all "birdstep"		"odbc"
261
	confutils_use_depend_all "birdstep"		"odbc"

Return to bug 53886