diff options
| author |   Christian Hoffmann <hoffie@gentoo.org> | 2007-10-05 21:35:26 +0000 |
|---|---|---|
| committer | Christian Hoffmann <hoffie@gentoo.org> | 2007-10-05 21:35:26 +0000 |
| commit | 2beb8ac86e479c605adc53250d8c6f7f58396d24 (patch) | |
| tree | ba8b19c0c6a8b6fc2824b2618ce7e865d4758048 /eclass | |
| parent | Sparc stable --- part of Bug #177209 (diff) | |
| download | gentoo-2-2beb8ac86e479c605adc53250d8c6f7f58396d24.tar.gz gentoo-2-2beb8ac86e479c605adc53250d8c6f7f58396d24.tar.bz2 gentoo-2-2beb8ac86e479c605adc53250d8c6f7f58396d24.zip | |
fixing firebird and interbase support for php-4.4* and -5.2*, bug 186791
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/php4_4-sapi.eclass | 16 | ||||
| -rw-r--r-- | eclass/php5_2-sapi.eclass | 14 |
2 files changed, 25 insertions, 5 deletions
diff --git a/eclass/php4_4-sapi.eclass b/eclass/php4_4-sapi.eclass index a36c9c33c3e6..628fe2e99dcd 100644 --- a/eclass/php4_4-sapi.eclass +++ b/eclass/php4_4-sapi.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php4_4-sapi.eclass,v 1.40 2007/09/02 17:49:20 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php4_4-sapi.eclass,v 1.41 2007/10/05 21:35:26 hoffie Exp $ # ======================================================================== # Based on robbat2's work on the php4 sapi eclass @@ -191,6 +191,7 @@ php4_4-sapi_check_use_flags() { phpconfutils_use_conflict "readline" "libedit" phpconfutils_use_conflict "recode" "mysql" "imap" "yaz" phpconfutils_use_conflict "sharedmem" "threads" + phpconfutils_use_conflict "firebird" "interbase" # IMAP support php_check_imap @@ -504,8 +505,17 @@ php4_4-sapi_src_compile() { fi # Interbase support - if use firebird || use interbase ; then - my_conf="${my_conf} --with-interbase=/usr" + if use interbase ; then + my_conf="${my_conf} --with-interbase=/opt" + fi + + # Firebird support - see Bug 186791 + if use firebird ; then + if has_version "<dev-db/firebird-2.0.3.12981.0-r1" ; then + my_conf="${my_conf} --with-interbase=/opt" + else + my_conf="${my_conf} --with-interbase=/usr" + fi fi # LDAP support diff --git a/eclass/php5_2-sapi.eclass b/eclass/php5_2-sapi.eclass index 2989f6b493ce..176e1cc4189f 100644 --- a/eclass/php5_2-sapi.eclass +++ b/eclass/php5_2-sapi.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.15 2007/09/30 12:20:10 hoffie Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.16 2007/10/05 21:35:26 hoffie Exp $ # ======================================================================== # Based on robbat2's work on the php4 sapi eclass @@ -207,6 +207,7 @@ php5_2-sapi_check_use_flags() { phpconfutils_use_conflict "readline" "libedit" phpconfutils_use_conflict "recode" "mysql" "imap" "yaz" phpconfutils_use_conflict "sharedmem" "threads" + phpconfutils_use_conflict "firebird" "interbase" # IMAP support php_check_imap @@ -520,10 +521,19 @@ php5_2-sapi_src_compile() { fi # Interbase support - if use firebird || use interbase ; then + if use interbase ; then my_conf="${my_conf} --with-interbase=/opt" fi + # Firebird support - see Bug 186791 + if use firebird ; then + if has_version "<dev-db/firebird-2.0.3.12981.0-r1" ; then + my_conf="${my_conf} --with-interbase=/opt" + else + my_conf="${my_conf} --with-interbase=/usr" + fi + fi + # LDAP support if use ldap || phpconfutils_usecheck ldap ; then if use oci8 ; then |