diff options
| author |   Matti Bickel <mabi@gentoo.org> | 2010-07-05 23:22:43 +0000 |
|---|---|---|
| committer | Matti Bickel <mabi@gentoo.org> | 2010-07-05 23:22:43 +0000 |
| commit | a277bbc063253ef4e19dadf06f22f4d9b48276bb (patch) | |
| tree | 8659e3b38e1d559737f39d1c865b26eddeb0d972 /dev-lang/php | |
| parent | bug #319623 (diff) | |
| download | historical-a277bbc063253ef4e19dadf06f22f4d9b48276bb.tar.gz historical-a277bbc063253ef4e19dadf06f22f4d9b48276bb.tar.bz2 historical-a277bbc063253ef4e19dadf06f22f4d9b48276bb.zip | |
bug #327025
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'dev-lang/php')
| -rw-r--r-- | dev-lang/php/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/php/Manifest | 4 | ||||
| -rw-r--r-- | dev-lang/php/files/eblits/src_configure-v1.eblit | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog index f801770adf4b..e3e95f0fc20c 100644 --- a/dev-lang/php/ChangeLog +++ b/dev-lang/php/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/php # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.389 2010/07/05 23:19:20 mabi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.390 2010/07/05 23:22:43 mabi Exp $ + + 05 Jul 2010; Matti Bickel <mabi@gentoo.org> + files/eblits/src_configure-v1.eblit: + fix compilation on x64 systems (bug #327025) 05 Jul 2010; Matti Bickel <mabi@gentoo.org> php-5.2.13.ebuild: introduced new style virtual httpd-php (bug #319623) diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index fb26a672c816..dba77e00e5cf 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -7,7 +7,7 @@ AUX eblits/common-v1.eblit 376 RMD160 524d38035ef01b215c6dc06699c41550c246de9d S AUX eblits/pkg_postinst-v1.eblit 2184 RMD160 ce65ba811eab10862d067c7e2b4bdc8d2b0aee56 SHA1 11c14f2235041cfb08e33cf2550bebef2037e92b SHA256 9e1cd81be4f051f3156de0ce5398a338b2ab6f8e73047c5983beda47f2f762b0 AUX eblits/pkg_setup-v1.eblit 643 RMD160 b0ac84af7c2cddaca058ca0562306cdc8ddff108 SHA1 88572e5da2d10b2bcbfa3f35a2d39366cbabb364 SHA256 6b7181294ce309d5cdee68e1f7e7c9365910c940db4391ae1ca62e0d6eb9b27e AUX eblits/src_compile-v1.eblit 1851 RMD160 64e65a7647907da821a277da9a4df970ae3bda0b SHA1 c22b8c4526ce081fb7de8234d93cc8cfa2616414 SHA256 da47bc9f75ba4de64c1848b07ea1324b707301421431f469296f32a8f2369648 -AUX eblits/src_configure-v1.eblit 9853 RMD160 f254f602a885bea556768250445d70156ae34a8d SHA1 8895766562f0045f057a95d918308232005dfd61 SHA256 b954cb2bfaa4fc6fe55e3752f5491282db0a5d48966e1a3cd6f55fed1eb63bcc +AUX eblits/src_configure-v1.eblit 9920 RMD160 3c0525eeeb3a1b9ad57f4d72b90640f065daff2d SHA1 71eecebfb96b202dc3ffae6ffda4b67902217e6e SHA256 52ecae46f02d7e1e8db983335ef4bad1e73ec9249e34d61391359a8c690f6fd3 AUX eblits/src_install-v1.eblit 4025 RMD160 150514ec274f0892ee271466015116493eb4a74e SHA1 91b7bffec8fccf4b3230e2072e0ccf555b4c671e SHA256 2b1da468a1ecfa1507b9ab51e626203d421e5c4a3b694d77b01c065e3ae4fcff AUX eblits/src_prepare-v1.eblit 2616 RMD160 ccff64d09cc90ada1ea5d1311457cf9a05f12f8e SHA1 7db40d0ca7ef01e5b61962f261511803f768f1bc SHA256 915b9755a37f7670f6e436fe5072dae8f5e6b437ccdfbff835e26bb2f9d22b1e AUX eblits/src_test-v1.eblit 1480 RMD160 68ef731042ef236efee923649b318239c0219d52 SHA1 81c047f180e43eb1e6b0309ee8d6751950ce1b97 SHA256 ddc836ca2e7b2abac20450fc6eb8c7d30277c567d23051016b903ece1d07a6b2 @@ -22,5 +22,5 @@ DIST suhosin-patch-5.2.13-0.9.7.patch.gz 22989 RMD160 63a022a5bf0fb8c6688f4c0ebc DIST suhosin-patch-5.3.2-0.9.9.1.patch.gz 40847 RMD160 64d8b7ec2ec91fd7a43b0cd95c0aa0df5b666768 SHA1 c48d3f24341d3b0214ca3e980320b23864aa93ba SHA256 a61f081022888bf78997e434744d6c0604194c73a00e70c1165524a0a6329de2 EBUILD php-5.2.13.ebuild 16859 RMD160 e899ea551626ec77614931e052189a51b52cac5f SHA1 9092d7dd5eb208954096f67df1a36eef8be37ffa SHA256 95e359d899c9e42e358789029e535a4b54d8ab428a3c83503e0964831ed1775d EBUILD php-5.3.2.ebuild 9365 RMD160 afe466f09d14dc5ee20f8a55ba153500e115babe SHA1 37be3c2c873b0ac97c8f2fd0598f0af18e5ae01f SHA256 fc26ce0a37c9e2bce49b9b29fe7fa2daef76ef9075103f8e4b80eda1378ff35c -MISC ChangeLog 67418 RMD160 6cfe3343ae2c82c6faa78f95ca4d467b93503133 SHA1 68e50f3e5d88b1cd7efb0d36bb605db9c33fb3cb SHA256 e581f53bb48b1e86a9f9ce31fabc9058c84be33f3210daa35ede732edab4f705 +MISC ChangeLog 67551 RMD160 02dbd6d964b47f61f3ac0501afd8f595ada926ab SHA1 11da636fb2f765d1d7ca5effc2a925e50de4eb6a SHA256 d8247966808a17a7a6a808293406478011fd94f3c367a3aff0bc6f6f2e662519 MISC metadata.xml 2185 RMD160 2e1d4afa19f7370b62080f3f62bc0f8e525b82bd SHA1 2b758e52eb1e1130fffe162e6cd2122deaf18bf3 SHA256 8a8be20f80edd56dd9f16b90f4ff91fde426b05861e737750664223801e2c667 diff --git a/dev-lang/php/files/eblits/src_configure-v1.eblit b/dev-lang/php/files/eblits/src_configure-v1.eblit index 22c9631ec75f..f3984c4b6521 100644 --- a/dev-lang/php/files/eblits/src_configure-v1.eblit +++ b/dev-lang/php/files/eblits/src_configure-v1.eblit @@ -1,17 +1,19 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v1.eblit,v 1.2 2010/06/11 17:15:29 mabi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v1.eblit,v 1.3 2010/07/05 23:22:43 mabi Exp $ eblit-php-src_configure() { PHP_DESTDIR="/usr/$(get_libdir)/php${PHP_MV}" # This is a global variable and should be in caps. It isn't because the # phpconfutils eclass relies on exactly this name... + # for --with-libdir see bug #327025 my_conf=" --prefix="${PHP_DESTDIR}" --mandir="${PHP_DESTDIR}"/man --infodir="${PHP_DESTDIR}"/info --libdir="${PHP_DESTDIR}"/lib + --with-libdir=$(get_libdir) --without-pear $(use_enable threads maintainer-zts)" |