Simplify src_compile and grab binaries/apache modules directly from sapis-build directory, circumventing make install-sapi to fix bug #351266

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

5 files changed, 63 insertions, 34 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 544a7392d756..90f2e2fb8b99 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.516 2011/10/20 08:27:33 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.517 2011/10/31 16:18:04 mabi Exp $
+
+  31 Oct 2011; Matti Bickel <mabi@gentoo.org>
+  +files/eblits/src_compile-v2.eblit, files/eblits/src_install-v3.eblit,
+  php-5.4.0_beta2.ebuild:
+  Simplify src_compile and grab binaries/apache modules directly from
+  sapis-build directory, circumventing make install-sapi to fix bug #351266
 
 *php-5.4.0_beta2 (20 Oct 2011)
 
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index c47f45422c14..684c5fe46d15 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 20php5-envd 145 RMD160 8c81fb7dc1d1ddf16fd956d748514db3bcb27603 SHA1 f1cef57c0def8e2c5422aaf136f40b4ff47801d2 SHA256 efaae9e6ae5f7010e073c2ab6d8a9dda009f0707c7d7b0c027e142c94f7041a4
 AUX 70_mod_php5.conf-apache2 348 RMD160 9f3f49a52ebf92c2650501c5ceb6f95ce4bb2e76 SHA1 62992e793446b4a9a64900d1ecba7bae06873382 SHA256 5bb8a45570582b4389a7d3feea0398e1c13ed4ced96e559b9406ed8c965dea8c
 AUX 70_mod_php5.conf-apache2-r1 374 RMD160 ca06cdc9d1a3dc4129a60c938ee3a1b542497fbb SHA1 4733066b6324c5870e716485484c44c7c26a9ff1 SHA256 815c1ca23c9afe8479568ceaac4057eb91ea5444fbd863866b29adb4eea2c82b
@@ -12,6 +9,7 @@ AUX eblits/pkg_setup-v1.eblit 648 RMD160 ff9606a7a1d264d74346bfb32224b2f2301e6fb
 AUX eblits/pkg_setup-v2.eblit 393 RMD160 430ab1f0227011172d422886862bd59d3886034a SHA1 2fdb587135cd0fe84ea51bfee8cf4ea9fd67dcb5 SHA256 17f9316065960ff0ca56aeec918c2c9e6c80ffdf951a238f7271a589753e320c
 AUX eblits/pkg_setup-v3.eblit 283 RMD160 f1b8307ad0c1f05e6acdd38fb70cec2c65e47cf8 SHA1 97361e7542a3dc3bb6d803ddab2a150f40ba8531 SHA256 5905eb3e6d984a9f8fe49e088adad99db7249f62a957c19f0ae4bf3f56ecaecd
 AUX eblits/src_compile-v1.eblit 1283 RMD160 83fbb374e2dfaa9d164e6b32b57c268ed06bf519 SHA1 09124cbc9008bfb72eb24cd24b2319d22df52c2c SHA256 5ec76ae24304c5f803a615a98394c219018da1b1ce2018f92f6ac8c5becf6c99
+AUX eblits/src_compile-v2.eblit 515 RMD160 566e373f081d0310768753cde2320966ec5809a5 SHA1 af5d50abc74decb1c3f084d6d5b56dde1afe88d8 SHA256 60fe1529591f7531ad4af37fab1a52e2ffe197f27a19f269b3b62fdbc044261c
 AUX eblits/src_configure-snapshots.eblit 10639 RMD160 b46a407286aa32077662fa4f75345466681943bd SHA1 3375592869e274a9668a9e7c20ae4046d1e11244 SHA256 ee92ea71f6c766f6f10fda63aab36885265c95e245e8107fb2e9c10573f6e2ba
 AUX eblits/src_configure-v1.eblit 10979 RMD160 c20ce6476380cf1b355f1c957f8e0bfdf166e220 SHA1 bd2f51283e01bf838bbb1946a9879ac337c6e90c SHA256 dc769b7c5846248fdd5d1a930a3e9b614d550bfcc78f09ecd1c08607796f0206
 AUX eblits/src_configure-v2.eblit 10855 RMD160 27c70744216912e79707c6861bc7d00a379d690a SHA1 7629d985421b756aa57bcce51d378ff14db675c8 SHA256 cd3002b6c9bd91dc9d7471e416cc631247fb2ad9d7b68981b26a3f83f84c916a
@@ -19,7 +17,7 @@ AUX eblits/src_configure-v3.eblit 6616 RMD160 95b389d83f86dc262a698d9f3a3cc35ccf
 AUX eblits/src_configure-v521.eblit 10844 RMD160 90513f59b5f17d680004d3e74581d9eedc8af490 SHA1 a369e2cf7816799f7e2bead8b6eccc2115d0ecdc SHA256 ad875ca45e9ad975c0d7a3cbedc27c5035aa048d7aa935221a15e47cbca63c3d
 AUX eblits/src_install-v1.eblit 5146 RMD160 24127823735939101dcb00585a5ed69adedffed2 SHA1 36ab2648abaae12d1a86c97db82cd2ea86497b2d SHA256 3bddd375764b0ed00cb30e65036c67f96c56ea0ebfd70bcdc61b7465d1500d36
 AUX eblits/src_install-v2.eblit 5302 RMD160 a6e89565235f6baf14ee38326f94a0ed39f54183 SHA1 83b461036b1fd7170e3966399f4110a2e9363f41 SHA256 466e7350126a2c27814c693c7c7fcc45ee53eb4d267846d5b27a02c377b5407d
-AUX eblits/src_install-v3.eblit 4199 RMD160 3dcf1550790deb8eaf70b64be579cba32b1000df SHA1 dab9603c4940233949feb1839a1b990070529396 SHA256 fb210f93a5c1d8794cc0d76d0e66ab92efffc5acaf5243574a26e2a4432da9b5
+AUX eblits/src_install-v3.eblit 4568 RMD160 187f5ff8133bb85cbd7bfaebe3b65109eab0e4e5 SHA1 0489ee3f01efe33ede5e992fb67e03838dbdb657 SHA256 34b9c059a9f91faf247639bb6cc592a342185a4dbc2f2f5333350f157a33dc7f
 AUX eblits/src_prepare-snapshots.eblit 2238 RMD160 d82ee01ee6cc6bae7b7199296e32bcac093f2fae SHA1 deebebf641b935e4fdcda63f3f9ce9df01bdb037 SHA256 411ce9d56008461da4592dcf623fcff40c33aac479d13544f84cc974c5c232ea
 AUX eblits/src_prepare-v2.eblit 2604 RMD160 379dbca3e2ae8c1f09f608220ec9c98d099cb792 SHA1 42afae4e07633535ecea49817f5badd559f10ff1 SHA256 fe7534260fb81a012b8021b5d555756ce8733ad192bf51cedd94f12963811790
 AUX eblits/src_prepare-v3.eblit 2649 RMD160 5f01f42eef528535866c3b5ade0ded592d1ffd48 SHA1 1bdc640ab548f4e8b78acc305fdd6ceab225daf8 SHA256 7ea3a5351fabeb050161e64c09b98ff945bbdb8b4d1a7fb83d6b4645f277b486
@@ -47,17 +45,6 @@ DIST suhosin-patch-5.3.7-0.9.10.patch.gz 41175 RMD160 19f789bf49a5fed2cd88b199fd
 EBUILD php-5.2.17.ebuild 9357 RMD160 0b58506aa7df24546ecbcf8fce42a6ce7f5cc2f2 SHA1 7d4055e988d1cc7ac4932ce82543bcece76a4ba5 SHA256 8c9f0ba52b7e8297b0ecdbcc1ad5bde40e5d4d602cb70ed2f5d0262032cc393b
 EBUILD php-5.3.8.ebuild 9601 RMD160 82879062916c7e796f872e8627bedf79bf912a0e SHA1 05d6bae0984a63b8e958cd2fae30b4dccc5e7664 SHA256 6a9dc8758b2b219d854c6af51d3245ffdfd6ed732f0a2f7e7c80b32fde09ca0d
 EBUILD php-5.4.0_beta1.ebuild 8530 RMD160 f74007f6f70c2cb9e0fcd63bb3a8867f24c4cbba SHA1 893cf7c3d7dd05dd9b0aad2aa6838bb1c008e89c SHA256 650e9840c21e596f88e27435d3ed199b691b3610e4ecc1d0e3cd175dde16d01c
-EBUILD php-5.4.0_beta2.ebuild 8530 RMD160 eb45642338127e1dbf3eb854d488525132113777 SHA1 0862a13b9e528739e9a53e07daf38427dd1ae7f3 SHA256 3c9061df81406b7668f1a80ea9a019d0edb8557207340c81d1fe081b914476f4
-MISC ChangeLog 87568 RMD160 c372de7e320bb334e4d7c976258d67df6cb0a539 SHA1 02e184094efcaf29b069ce630246f7fc32151805 SHA256 438b5fc2ba3a45e526961af42ed3e83534d0a6ce04e6c90245e26a90f8f9ecea
+EBUILD php-5.4.0_beta2.ebuild 8525 RMD160 de5e2d697824614e2530d1fba5c33301d3f4cb2e SHA1 c32f177082a8a35693c3ac59f2bccdb3e93a6523 SHA256 0e44b6cb80759f7971ffac904b7dd4b7b191b7b716cee28a24d470d038b8e428
+MISC ChangeLog 87855 RMD160 693257255de95abe34231530d4d02dd67d719865 SHA1 9934bed16dfd23269d23a2716aa2ebd6abbaa6e1 SHA256 8a7417d8ec33eb4d54d2dc1c565593de1d425654ec5753a87f1bccb98a345092
 MISC metadata.xml 2075 RMD160 e2eb44e39169dc2ff8e099d670a222e7102b1aea SHA1 9cebbc373dc8441aa0374132a3b5d87df6d37ffc SHA256 3d8bc9305be300ef7ef92d18ba5476927ec90a5b6d43c2408936229590ff5ac5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQEcBAEBAgAGBQJOn9tvAAoJEGurSuXEqSv16d8H/1YREYy2YFHAIdVmlADOaTPD
-FkHNPmGetrstCyA2GN8z9/nNy+S6WR43x6cpoQP4ZRqD+mdXIG5qlQ+B39KJ/NbZ
-7F2IOFZFvmU2c2TQKPfy9+9FtyZrURhB7ID6gyKlHveDNpbFxjroOxpy/pxV+tX+
-Ioh5pjNygDtQn/U7TX0h1Dcp8ebyn840G15XAentZ7VPOIvtSlnk/eKzDFHdaH75
-j2P+nkBlteY+Z9K3pgOIAPqiiZ5ITJQ/s+rKowjd66CXqvI9NqX5kyhtjkjgbFfn
-eyYYwSlBQU8O1qPebxJmPKHvSqewWGF0Qb5ujx7ooenK9u4HdPAU1jqWoNMt62I=
-=fDV1
------END PGP SIGNATURE-----
diff --git a/dev-lang/php/files/eblits/src_compile-v2.eblit b/dev-lang/php/files/eblits/src_compile-v2.eblit
new file mode 100644
index 000000000000..6e3d27707dbc
--- /dev/null
+++ b/dev-lang/php/files/eblits/src_compile-v2.eblit
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_compile-v2.eblit,v 1.3 2011/10/31 16:18:04 mabi Exp $
+
+eblit-php-src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+
+	for sapi in ${SAPIS} ; do
+		use "${sapi}" && php_sapi_build "${sapi}"
+	done
+}
+
+php_sapi_build() {
+	cd "${WORKDIR}/sapis-build/$1"
+	emake || die "emake failed"
+}
diff --git a/dev-lang/php/files/eblits/src_install-v3.eblit b/dev-lang/php/files/eblits/src_install-v3.eblit
index 316d42b4cf41..4f6eed209cc0 100644
--- a/dev-lang/php/files/eblits/src_install-v3.eblit
+++ b/dev-lang/php/files/eblits/src_install-v3.eblit
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v3.eblit,v 1.3 2011/09/16 07:02:57 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v3.eblit,v 1.4 2011/10/31 16:18:04 mabi Exp $
 
 eblit-php-src_install() {
 	# see bug #324739 for what happens when we don't have that
@@ -36,20 +36,39 @@ eblit-php-src_install() {
 		if use "${sapi}" ; then
 			einfo "Installing SAPI: ${sapi}"
 			cd "${WORKDIR}/sapis-build/${sapi}"
-			# needed each time, php_install_ini would reset it
-			into "${PHP_DESTDIR}"
-			file=$(find "${SAPI_DIR}/${sapi}/" -type f | head -n 1)
-
-			if [[ "${file: -3}" == ".so" ]]; then 
-				if [[ "${sapi}" == "apache2" ]]; then
-					insinto "${PHP_DESTDIR}/apache2/"
-					newins "${file}" "${file/*\/}"
-                    keepdir "/usr/$(get_libdir)/apache2/modules"
+
+			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}/apache2/"
+				newins ".libs/libphp5.so" "libphp${PHP_MV}.so"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				into "${PHP_DESTDIR}"
+			    case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}.so"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source: -3}" == ".so" ]]; then 
+					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
 				else
-					dolib.so "${file}" || die "Unable to install ${sapi} sapi"
+					dobin "${source}" || die "Unable to install ${sapi} sapi"
 				fi
-			else
-				dobin "${file}" || die "Unable to install ${sapi} sapi"
 			fi
 
 			php_install_ini "${sapi}"
@@ -57,7 +76,7 @@ eblit-php-src_install() {
 			# construct correct SAPI string for php-config
 			# thanks to ferringb for the bash voodoo
 			if [[ "${sapi}" == "apache2" ]]; then
-			    sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
 			else
 				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
 			fi
diff --git a/dev-lang/php/php-5.4.0_beta2.ebuild b/dev-lang/php/php-5.4.0_beta2.ebuild
index c6d640ef431d..1d259abd68a4 100644
--- a/dev-lang/php/php-5.4.0_beta2.ebuild
+++ b/dev-lang/php/php-5.4.0_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.0_beta2.ebuild,v 1.1 2011/10/20 08:27:33 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.0_beta2.ebuild,v 1.2 2011/10/31 16:18:04 mabi Exp $
 
 EAPI=4
 
@@ -323,7 +323,7 @@ eblit-pkg pkg_setup v3
 
 src_prepare() { eblit-run src_prepare v4 ; }
 src_configure() { eblit-run src_configure v3 ; }
-src_compile() { eblit-run src_compile v1 ; }
+src_compile() { eblit-run src_compile v2 ; }
 src_install() { eblit-run src_install v3 ; }
 src_test() { eblit-run src_test v1 ; }
 pkg_postinst() { eblit-run pkg_postinst v2 ; }