| 1 |
hoffie 08/05/27 10:14:35 |
| 2 |
|
| 3 |
Modified: php-common-r1.eclass |
| 4 |
Log: |
| 5 |
trying to fix postgresql check logic in php-common-r1.eclass, bug 223797 |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.15 eclass/php-common-r1.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-common-r1.eclass?rev=1.15&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-common-r1.eclass?rev=1.15&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-common-r1.eclass?r1=1.14&r2=1.15 |
| 13 |
|
| 14 |
Index: php-common-r1.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v |
| 17 |
retrieving revision 1.14 |
| 18 |
retrieving revision 1.15 |
| 19 |
diff -u -r1.14 -r1.15 |
| 20 |
--- php-common-r1.eclass 25 May 2008 09:27:48 -0000 1.14 |
| 21 |
+++ php-common-r1.eclass 27 May 2008 10:14:34 -0000 1.15 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2007 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v 1.14 2008/05/25 09:27:48 hoffie Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v 1.15 2008/05/27 10:14:34 hoffie Exp $ |
| 27 |
|
| 28 |
# Based on robbat2's work on the php4 sapi eclass |
| 29 |
# Based on stuart's work on the php5 sapi eclass |
| 30 |
@@ -209,23 +209,24 @@ |
| 31 |
# ======================================================================== |
| 32 |
|
| 33 |
php_check_pgsql() { |
| 34 |
- if use "postgres" \ |
| 35 |
- && use "apache2" && use "threads" ; then |
| 36 |
- if has_version ">=dev-db/libpq-8.1.3-r1" \ |
| 37 |
- && ! built_with_use ">=dev-db/libpq-8.1.3-r1" "threads" ; then |
| 38 |
- eerror |
| 39 |
- eerror "You must build dev-db/libpq with USE=threads" |
| 40 |
- eerror "if you want to build PHP with threads support!" |
| 41 |
- eerror |
| 42 |
- die "Rebuild dev-db/libpq with USE=threads" |
| 43 |
- fi |
| 44 |
- local pgsql_ver=$(eselect postgresql show) |
| 45 |
- if ! built_with_use "=dev-db/postgresql-base-${pgsql_ver}*" threads ; then |
| 46 |
- eerror |
| 47 |
- eerror "You must build =dev-db/postgresql-base-${pgsql_ver} with USE=threads" |
| 48 |
- eerror "if you want to build PHP with threads support!" |
| 49 |
- eerror |
| 50 |
- die "Rebuild =dev-db/postgresql-base-${pgsql_ver} with USE=threads" |
| 51 |
+ if use "postgres" && use "apache2" && use "threads" ; then |
| 52 |
+ if has_version ">=dev-db/libpq-8.1.3-r1" ; then |
| 53 |
+ if ! built_with_use ">=dev-db/libpq-8.1.3-r1" "threads" ; then |
| 54 |
+ eerror |
| 55 |
+ eerror "You must build dev-db/libpq with USE=threads" |
| 56 |
+ eerror "if you want to build PHP with threads support!" |
| 57 |
+ eerror |
| 58 |
+ die "Rebuild dev-db/libpq with USE=threads" |
| 59 |
+ fi |
| 60 |
+ else |
| 61 |
+ local pgsql_ver=$(eselect postgresql show) |
| 62 |
+ if ! built_with_use "=dev-db/postgresql-base-${pgsql_ver}*" threads ; then |
| 63 |
+ eerror |
| 64 |
+ eerror "You must build =dev-db/postgresql-base-${pgsql_ver} with USE=threads" |
| 65 |
+ eerror "if you want to build PHP with threads support!" |
| 66 |
+ eerror |
| 67 |
+ die "Rebuild =dev-db/postgresql-base-${pgsql_ver} with USE=threads" |
| 68 |
+ fi |
| 69 |
fi |
| 70 |
fi |
| 71 |
} |
| 72 |
|
| 73 |
|
| 74 |
|
| 75 |
-- |
| 76 |
gentoo-commits@l.g.o mailing list |
Archives