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

Collapse All | Expand All

(-)/usr/local/gentoo/usr/portage/dev-lang/php/php-5.5.15.ebuild (-6 / +11 lines)
Lines 243-249 Link Here
243
243
244
	if use_if_iuse opcache; then
244
	if use_if_iuse opcache; then
245
		elog "Adding opcache to $PHP_EXT_INI_DIR"
245
		elog "Adding opcache to $PHP_EXT_INI_DIR"
246
		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
246
		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache$(get_modname)" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
247
		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
247
		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
248
	fi
248
	fi
249
249
Lines 611-618 Link Here
611
			if [[ "${sapi}" == "apache2" ]] ; then
611
			if [[ "${sapi}" == "apache2" ]] ; then
612
				# We're specifically not using emake install-sapi as libtool
612
				# We're specifically not using emake install-sapi as libtool
613
				# may cause unnecessary relink failures (see bug #351266)
613
				# may cause unnecessary relink failures (see bug #351266)
614
				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
614
				local dest="${PHP_DESTDIR#${EPREFIX}}/apache2"
615
				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
615
				insinto "${dest}"
616
				newins "./libs/libphp5$(get_modname)" "libphp${PHP_MV}$(get_modname)"
617
				# make link name with libname ext instead of modname for compatibility with eselect
618
				if [ "$(get_modname)" != "$(get_libname)" ]; then
619
					dosym "libphp${PHP_MV}$(get_modname)" "${dest}/libphp${PHP_MV}$(get_libname)"
620
				fi
616
				keepdir "/usr/$(get_libdir)/apache2/modules"
621
				keepdir "/usr/$(get_libdir)/apache2/modules"
617
			else
622
			else
618
				# needed each time, php_install_ini would reset it
623
				# needed each time, php_install_ini would reset it
Lines 629-642 Link Here
629
						source="sapi/fpm/php-fpm"
634
						source="sapi/fpm/php-fpm"
630
						;;
635
						;;
631
					embed)
636
					embed)
632
						source="libs/libphp${PHP_MV}$(get_libname)"
637
						source="libs/libphp${PHP_MV}$(get_modname)"
633
						;;
638
						;;
634
					*)
639
					*)
635
						die "unhandled sapi in src_install"
640
						die "unhandled sapi in src_install"
636
						;;
641
						;;
637
				esac
642
				esac
638
643
639
				if [[ "${source}" == *"$(get_libname)" ]]; then
644
				if [[ "${source}" == *"$(get_modname)" ]]; then
640
					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
645
					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
641
				else
646
				else
642
					dobin "${source}" || die "Unable to install ${sapi} sapi"
647
					dobin "${source}" || die "Unable to install ${sapi} sapi"
Lines 659-665 Link Here
659
664
660
	# Installing opcache module
665
	# Installing opcache module
661
	if use_if_iuse opcache ; then
666
	if use_if_iuse opcache ; then
662
		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
667
		dolib.so "modules/opcache$(get_modname)" || die "Unable to install opcache module"
663
	fi
668
	fi
664
669
665
	# Install env.d files
670
	# Install env.d files

Return to bug 520356