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

Collapse All | Expand All

(-)php-5.4.6-r2.ebuild.orig (-4 / +11 lines)
Lines 321-327 Link Here
321
321
322
eblit-pkg pkg_setup v3
322
eblit-pkg pkg_setup v3
323
323
324
src_prepare() { eblit-run src_prepare v4 ; }
324
src_prepare() {
325
	eblit-run src_prepare v4
326
327
	if [[ ${CHOST} == *-darwin* ]] ; then
328
		# http://bugs.php.net/bug.php?id=48795, bug #343481
329
		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
330
	fi
331
}
325
src_configure() { eblit-run src_configure v54 ; }
332
src_configure() { eblit-run src_configure v54 ; }
326
src_compile() { eblit-run src_compile v2 ; }
333
src_compile() { eblit-run src_compile v2 ; }
327
src_install() { eblit-run src_install v3 ; }
334
src_install() { eblit-run src_install v3 ; }
Lines 354-360 Link Here
354
		fi
361
		fi
355
	done
362
	done
356
363
357
	elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order"
364
	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
358
	elog "to compile extensions for the ${SLOT} ABI"
365
	elog "to compile extensions for the ${SLOT} ABI"
359
	elog
366
	elog
360
	if ! use readline && use cli ; then
367
	if ! use readline && use cli ; then
Lines 364-371 Link Here
364
	elog
371
	elog
365
	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
372
	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
366
	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
373
	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
367
	elog "'production' or 'development' in /etc/make.conf"
374
	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
368
	elog "Both versions of php.ini can be found in /usr/share/doc/${PF}"
375
	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
369
376
370
	elog
377
	elog
371
	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
378
	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"

Return to bug 433842