[patch] gentoo-prefix-php-5.5.15-osx.patch

gentoo-prefix-php-5.5.15-osx.patch (text/plain), 2.19 KB, created by Artem Butusov on 2014-08-20 23:51:20 UTC

--- /usr/local/gentoo/usr/portage/dev-lang/php/php-5.5.15.ebuild	2014-08-10 16:34:17.000000000 -0400
+++ /usr/local/portage/dev-lang/php/php-5.5.15.ebuild	2014-08-20 16:59:17.000000000 -0400
@@ -243,7 +243,7 @@
 
 	if use_if_iuse opcache; then
 		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache$(get_modname)" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
 		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
 	fi
 
@@ -611,8 +611,13 @@
 			if [[ "${sapi}" == "apache2" ]] ; then
 				# We're specifically not using emake install-sapi as libtool
 				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
+				local dest="${PHP_DESTDIR#${EPREFIX}}/apache2"
+				insinto "${dest}"
+				newins "./libs/libphp5$(get_modname)" "libphp${PHP_MV}$(get_modname)"
+				# make link name with libname ext instead of modname for compatibility with eselect
+				if [ "$(get_modname)" != "$(get_libname)" ]; then
+					dosym "libphp${PHP_MV}$(get_modname)" "${dest}/libphp${PHP_MV}$(get_libname)"
+				fi
 				keepdir "/usr/$(get_libdir)/apache2/modules"
 			else
 				# needed each time, php_install_ini would reset it
@@ -629,14 +634,14 @@
 						source="sapi/fpm/php-fpm"
 						;;
 					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
+						source="libs/libphp${PHP_MV}$(get_modname)"
 						;;
 					*)
 						die "unhandled sapi in src_install"
 						;;
 				esac
 
-				if [[ "${source}" == *"$(get_libname)" ]]; then
+				if [[ "${source}" == *"$(get_modname)" ]]; then
 					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
 				else
 					dobin "${source}" || die "Unable to install ${sapi} sapi"
@@ -659,7 +664,7 @@
 
 	# Installing opcache module
 	if use_if_iuse opcache ; then
-		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
+		dolib.so "modules/opcache$(get_modname)" || die "Unable to install opcache module"
 	fi
 
 	# Install env.d files