summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatti Bickel <mabi@gentoo.org>2010-06-11 17:15:29 +0000
committerMatti Bickel <mabi@gentoo.org>2010-06-11 17:15:29 +0000
commitc3d3893381a716d6d45ae38bdb32f22e00c5954e (patch)
treec386f09c0fb7c0b552803416370d24a9a4eb4759 /dev-lang
parentStable for HPPA (bug #322679). (diff)
downloadhistorical-c3d3893381a716d6d45ae38bdb32f22e00c5954e.tar.gz
historical-c3d3893381a716d6d45ae38bdb32f22e00c5954e.tar.bz2
historical-c3d3893381a716d6d45ae38bdb32f22e00c5954e.zip
iodbc vs odbc, fix variable confusion leading to embed SAPI compile failure
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/php/ChangeLog7
-rw-r--r--dev-lang/php/Manifest8
-rw-r--r--dev-lang/php/files/eblits/src_compile-v1.eblit6
-rw-r--r--dev-lang/php/files/eblits/src_configure-v1.eblit7
-rw-r--r--dev-lang/php/php-5.3.2.ebuild4
5 files changed, 20 insertions, 12 deletions
diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 0e76525c6a3e..d8e067782fec 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,11 @@
# 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.382 2010/06/01 16:17:05 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.383 2010/06/11 17:15:29 mabi Exp $
+
+ 11 Jun 2010; <mabi@gentoo.org> files/eblits/src_compile-v1.eblit,
+ php-5.3.2.ebuild, files/eblits/src_configure-v1.eblit:
+ make USE="iodbc" independant from USE="odbc", fix embed SAPI compile
+ failure
01 Jun 2010; <mabi@gentoo.org> -files/eblits/common-v2.eblit,
-files/eblits/src_compile-v2.eblit, -files/eblits/src_install-v2.eblit,
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index a8a2ab5e1e40..45de8b9958b6 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -6,8 +6,8 @@ AUX 70_mod_php5_concurr.conf-apache2-r1 376 RMD160 4f7de5c0784b6191450b5c1a7de7a
AUX eblits/common-v1.eblit 376 RMD160 524d38035ef01b215c6dc06699c41550c246de9d SHA1 b85091f9e56b20217e5c2d3e25cef055642cd088 SHA256 d395752919fe05fa64a0e09deaf690e008a04f2c580f42233b5a854a1012045e
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 1863 RMD160 8ae0d633076f7dcf83bb725206e4501af55a1506 SHA1 bcbce68218f654c8273ca370a2dd74c76b5adf8b SHA256 0a7a0a350e81b8ac4b3a8185b4b379784c6e2e17db1c6e0cfcea5f4c7cb10ca9
-AUX eblits/src_configure-v1.eblit 9827 RMD160 272b8c5720b4a8f3f9deb601bfd68cc26273adab SHA1 dbfca765215b9539c88767389b6b615a07604146 SHA256 8947ca3957ecf8592db09c71862d4274f866005552a453ad15e842288079fd46
+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_install-v1.eblit 3584 RMD160 26ff6c2ce3c586a23f1ca7997aa94e0d6efc7083 SHA1 e6b98320877d8fbe5d7359190d774c16cd782c81 SHA256 86a8e9028eef946e770e26ec74b0a13edbe7934fa34365c1f6532061221faff0
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
@@ -41,6 +41,6 @@ EBUILD php-5.2.11.ebuild 16796 RMD160 4d55fe8a9787c726a23a426e891ceffbb44faef6 S
EBUILD php-5.2.12.ebuild 16901 RMD160 42ad4d01a89392445e491f1d784a7f23028fb0dc SHA1 17f6e1da1793a06c10636e332440c37535262a7d SHA256 cbab429ae3fe5bc0fe4cb961dbb1df91be35c04f7c8340cfee39117afcfeddcc
EBUILD php-5.2.13.ebuild 16879 RMD160 c580f3e8de5be0a3338ae3f816153c1d42b4337f SHA1 4bc3f1792d3f85a96ecbf538f97c76d1de8dda4a SHA256 811314bfdf521766794650581c963b31d81c10071311e20121e4a1ca5458a51f
EBUILD php-5.2.9-r2.ebuild 16727 RMD160 aa0e1af3e50b550111c3d1490adc9e8ed2432b34 SHA1 1e4b46b562d74e758db1ec52751419cd02333878 SHA256 7187f6feedc92c355543713cb07218a48f1cd45e9394fa6d4a00bbe7e5b3010b
-EBUILD php-5.3.2.ebuild 9379 RMD160 1858cc318c381f956e68a7cb215dda200c0b15b4 SHA1 726a6468111f36f4107d71239c18bb897e953c40 SHA256 681d51da472e131baec3b818987af8060a9e6931ddf0d0c68c017a2a4e1f7a7a
-MISC ChangeLog 66243 RMD160 caba27460aa1e15656528617319dfc95a5e4b703 SHA1 813272eb7024271e059485ecef023432d633f7dc SHA256 e3c7c0bdb7298328aead72a2c231125a939c466db3f9ef09b8c5ce23644c84ad
+EBUILD php-5.3.2.ebuild 9347 RMD160 af947f0a5d0f1d95832c037e8e5cf74af7b58b45 SHA1 cb6af3a4eff1c84822d7bd9c3fdfb2d574f51fc6 SHA256 515343dc77123d7f7b5336e2f64846a46e9d73823be7b244ea042df9faf10150
+MISC ChangeLog 66450 RMD160 e84578b192e250161f82acbb72472dc6caf8ed39 SHA1 cc4197a88d4f0d41918ec1e9ca2e5f9d0cdda18a SHA256 150ccd8e664436b6a82b09edc4952342a911a6bc4614b129c4565e3c5be77692
MISC metadata.xml 2264 RMD160 82c0da8dfb32f6747d25e1fcd228e7ff87661195 SHA1 1fdbe39bbc372da83fa44d620d087a11f075e20d SHA256 dfbbbf2fb81666c8051408f2e0f4695b3a5f38940ba2adbd0f7f53785ed9338e
diff --git a/dev-lang/php/files/eblits/src_compile-v1.eblit b/dev-lang/php/files/eblits/src_compile-v1.eblit
index 796fc8e45cab..290123c9036d 100644
--- a/dev-lang/php/files/eblits/src_compile-v1.eblit
+++ b/dev-lang/php/files/eblits/src_compile-v1.eblit
@@ -1,6 +1,6 @@
# 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_compile-v1.eblit,v 1.2 2010/06/09 08:52:07 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_compile-v1.eblit,v 1.3 2010/06/11 17:15:29 mabi Exp $
eblit-php-src_compile() {
SAPI_DIR="${WORKDIR}/sapis"
@@ -32,9 +32,9 @@ php_sapi_build() {
case "$one_sapi" in
cli|cgi|embed)
if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf="${sapi_conf} --enable-${available_sapi}"
+ sapi_conf="${sapi_conf} --enable-${one_sapi}"
else
- sapi_conf="${sapi_conf} --disable-${available_sapi}"
+ sapi_conf="${sapi_conf} --disable-${one_sapi}"
fi
;;
diff --git a/dev-lang/php/files/eblits/src_configure-v1.eblit b/dev-lang/php/files/eblits/src_configure-v1.eblit
index 60d41f46a39a..22c9631ec75f 100644
--- a/dev-lang/php/files/eblits/src_configure-v1.eblit
+++ b/dev-lang/php/files/eblits/src_configure-v1.eblit
@@ -1,6 +1,6 @@
# 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.1 2010/05/27 23:05:04 mabi Exp $
+# $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 $
eblit-php-src_configure() {
PHP_DESTDIR="/usr/$(get_libdir)/php${PHP_MV}"
@@ -153,11 +153,14 @@ eblit-php-src_configure() {
fi
phpconfutils_extension_with "esoob" "esoob" 1
phpconfutils_extension_with "ibm-db2" "db2" 1
- phpconfutils_extension_with "iodbc" "iodbc" 1 "/usr"
phpconfutils_extension_with "sapdb" "sapdb" 1
phpconfutils_extension_with "solid" "solid" 1
fi
+ if use iodbc ; then
+ phpconfutils_extension_with "iodbc" "iodbc" 1 "/usr"
+ fi
+
# Oracle support
phpconfutils_extension_with "oci8" "oci8" 1
if use oci8-instant-client ; then
diff --git a/dev-lang/php/php-5.3.2.ebuild b/dev-lang/php/php-5.3.2.ebuild
index d6e411903e72..2e4d77b54f4d 100644
--- a/dev-lang/php/php-5.3.2.ebuild
+++ b/dev-lang/php/php-5.3.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.2.ebuild,v 1.5 2010/06/01 16:17:05 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.2.ebuild,v 1.6 2010/06/11 17:15:29 mabi Exp $
EAPI=2
@@ -128,7 +128,7 @@ DEPEND="app-admin/php-toolkit
virtual/imap-c-client[kolab=]
)
intl? ( dev-libs/icu )
- iodbc? ( || ( dev-db/libiodbc >=dev-db/unixODBC-1.8.13 ) )
+ iodbc? ( dev-db/libiodbc )
kerberos? ( virtual/krb5 )
kolab? ( >=net-libs/c-client-2004g-r1 )
ldap? ( !oci8? ( >=net-nds/openldap-1.2.11 ) )