[patch] patch for php-5.4.6-r2.ebuild

php-5.4.6-r2.ebuild.patch (text/plain), 1.48 KB, created by Christoph Junghans (RETIRED) on 2012-09-03 20:49:00 UTC

--- php-5.4.6-r2.ebuild.orig	2012-09-03 14:41:28.000000000 -0600
+++ php-5.4.6-r2.ebuild	2012-09-03 14:44:27.000000000 -0600
@@ -321,7 +321,14 @@
 
 eblit-pkg pkg_setup v3
 
-src_prepare() { eblit-run src_prepare v4 ; }
+src_prepare() {
+	eblit-run src_prepare v4
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# http://bugs.php.net/bug.php?id=48795, bug #343481
+		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+	fi
+}
 src_configure() { eblit-run src_configure v54 ; }
 src_compile() { eblit-run src_compile v2 ; }
 src_install() { eblit-run src_install v3 ; }
@@ -354,7 +361,7 @@
 		fi
 	done
 
-	elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order"
+	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
 	elog "to compile extensions for the ${SLOT} ABI"
 	elog
 	if ! use readline && use cli ; then
@@ -364,8 +371,8 @@
 	elog
 	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
 	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
-	elog "'production' or 'development' in /etc/make.conf"
-	elog "Both versions of php.ini can be found in /usr/share/doc/${PF}"
+	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
+	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
 
 	elog
 	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"