[patch] Patch to turn libphp5.so to libphp5.bundle

php-libphp-bundle.diff (text/plain), 2.39 KB, created by Dirk Tilger on 2010-10-03 18:51:22 UTC

diff -ur /Gentoo/usr/portage/dev-lang/php/files/eblits/src_compile-v1.eblit dev-lang/php/files/eblits/src_compile-v1.eblit
--- /Gentoo/usr/portage/dev-lang/php/files/eblits/src_compile-v1.eblit	2010-09-21 23:31:43.000000000 +0400
+++ dev-lang/php/files/eblits/src_compile-v1.eblit	2010-09-30 22:17:55.000000000 +0400
@@ -38,7 +39,7 @@
 			source="sapi/fpm/php-fpm"
 			;;
 		embed)
-			source="libs/libphp${PHP_MV}.so"
+			source="libs/libphp${PHP_MV}"$(get_modname)
 			;;
 
 		apache2)
diff -ur /Gentoo/usr/portage/dev-lang/php/files/eblits/src_install-v1.eblit dev-lang/php/files/eblits/src_install-v1.eblit
--- /Gentoo/usr/portage/dev-lang/php/files/eblits/src_install-v1.eblit	2010-09-29 19:01:44.000000000 +0400
+++ dev-lang/php/files/eblits/src_install-v1.eblit	2010-10-01 00:55:43.000000000 +0400
@@ -49,7 +50,9 @@
 			into "${PHP_DESTDIR#${EPREFIX}}"
 			file=$(find "${SAPI_DIR}/${sapi}/" -type f | head -n 1)
 
-			if [[ "${file: -3}" == ".so" ]]; then 
+			local modname
+			modname=$(get_modname)
+			if [[ "${file: -${#modname}}" == ${modname} ]]; then 
 				if [[ "${sapi}" == "apache2" ]]; then
 					insinto "${PHP_DESTDIR#${EPREFIX}}/../apache2/modules/"
 					newins "${file}" "${file/*\/}"
@@ -131,6 +136,7 @@
 			insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"
 			newins "${FILESDIR}/70_mod_php${PHP_MV}_concurr.conf-apache2-r1" \
 				"70_mod_php${PHP_MV}_concurr.conf"
+			[[ ${CHOST} == *-darwin* ]] && sed -i 's!libphp5\.so!libphp5.bundle!' "${D}/${APACHE_MODULES_CONFDIR}/70_mod_php${PHP_MV}_concurr.conf"
 
 			# Put the ld version script in the right place so
 			# it's always accessible
@@ -141,6 +147,7 @@
 			insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"
 			newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2-r1" \
 				"70_mod_php${PHP_MV}.conf"
+			[[ ${CHOST} == *-darwin* ]] && sed -i 's!libphp5\.so!libphp5.bundle!' "${D}/${APACHE_MODULES_CONFDIR}/70_mod_php${PHP_MV}.conf"
 		fi
 	fi
 
diff -ur /Gentoo/usr/portage/dev-lang/php/php-5.3.3-r1.ebuild dev-lang/php/php-5.3.3-r1.ebuild
--- /Gentoo/usr/portage/dev-lang/php/php-5.3.3-r1.ebuild	2010-09-21 23:31:43.000000000 +0400
+++ dev-lang/php/php-5.3.3-r1.ebuild	2010-09-30 23:59:56.000000000 +0400
@@ -333,6 +333,8 @@
 		epatch "${FILESDIR}/php-5.3.3-ulong-osx.patch"
 	fi
 
+	epatch "${FILESDIR}"/${P}-darwin-bundle.patch
+	epatch "${FILESDIR}"/${P}-darwin-install-it.patch
 	eblit-run src_prepare v1 ; 
 }
 src_configure() { eblit-run src_configure v1 ; }