summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Longinotti <chtekk@gentoo.org>2006-08-29 22:34:50 +0000
committerLuca Longinotti <chtekk@gentoo.org>2006-08-29 22:34:50 +0000
commit116c91009f5b3a949fd6156be5297d31a0189bd9 (patch)
tree627aa17c23c4288bbb29744e5603f8ececaa719f /eclass/php5_1-sapi.eclass
parentversion bump (diff)
downloadgentoo-2-116c91009f5b3a949fd6156be5297d31a0189bd9.tar.gz
gentoo-2-116c91009f5b3a949fd6156be5297d31a0189bd9.tar.bz2
gentoo-2-116c91009f5b3a949fd6156be5297d31a0189bd9.zip
Remove PCRE support through external lib, it's broken (see http://bugs.php.net/bug.php?id=29914).
Diffstat (limited to 'eclass/php5_1-sapi.eclass')
-rw-r--r--eclass/php5_1-sapi.eclass11
1 files changed, 2 insertions, 9 deletions
diff --git a/eclass/php5_1-sapi.eclass b/eclass/php5_1-sapi.eclass
index d2fc8cc0043d..785d04b842f7 100644
--- a/eclass/php5_1-sapi.eclass
+++ b/eclass/php5_1-sapi.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5_1-sapi.eclass,v 1.31 2006/08/29 19:24:59 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_1-sapi.eclass,v 1.32 2006/08/29 22:34:50 chtekk Exp $
#
# ########################################################################
#
@@ -77,7 +77,6 @@ DEPEND="adabas? ( >=dev-db/unixODBC-1.8.13 )
nls? ( sys-devel/gettext )
oci8-instant-client? ( dev-db/oracle-instantclient-basic )
odbc? ( >=dev-db/unixODBC-1.8.13 )
- pcre? ( dev-libs/libpcre )
postgres? ( >=dev-db/libpq-7.1 )
qdbm? ( dev-db/qdbm )
readline? ( sys-libs/readline )
@@ -388,6 +387,7 @@ php5_1-sapi_src_compile() {
phpconfutils_extension_with "openssl" "ssl" 0
phpconfutils_extension_with "openssl-dir" "ssl" 0 "/usr"
phpconfutils_extension_enable "pcntl" "pcntl" 1
+ phpconfutils_extension_without "pcre-regex" "pcre" 0
phpconfutils_extension_disable "pdo" "pdo" 0
phpconfutils_extension_with "pgsql" "postgres" 1
phpconfutils_extension_disable "posix" "posix" 0
@@ -502,13 +502,6 @@ php5_1-sapi_src_compile() {
phpconfutils_extension_with "oci8" "oci8-instant-client" 1 "instantclient,/usr/lib/oracle/${OCI8IC_PKG}/client/lib"
fi
- # PCRE support
- if useq pcre || phpconfutils_usecheck pcre ; then
- phpconfutils_extension_with "pcre-regex" "pcre" 0 "/usr"
- else
- phpconfutils_extension_without "pcre-regex" "pcre" 0
- fi
-
# PDO support
if useq pdo || phpconfutils_usecheck pdo ; then
phpconfutils_extension_with "pdo-dblib" "mssql" 1