| 1 |
olemarkus 10/11/03 22:47:19 |
| 2 |
|
| 3 |
Modified: php-ext-source-r2.eclass |
| 4 |
Log: |
| 5 |
Fixed issues with zend_extension as well as removed dep on depend.php |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.5 eclass/php-ext-source-r2.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-ext-source-r2.eclass?rev=1.5&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-ext-source-r2.eclass?rev=1.5&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-ext-source-r2.eclass?r1=1.4&r2=1.5 |
| 13 |
|
| 14 |
Index: php-ext-source-r2.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v |
| 17 |
retrieving revision 1.4 |
| 18 |
retrieving revision 1.5 |
| 19 |
diff -u -r1.4 -r1.5 |
| 20 |
--- php-ext-source-r2.eclass 2 Nov 2010 21:46:05 -0000 1.4 |
| 21 |
+++ php-ext-source-r2.eclass 3 Nov 2010 22:47:19 -0000 1.5 |
| 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-ext-source-r2.eclass,v 1.4 2010/11/02 21:46:05 olemarkus Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.5 2010/11/03 22:47:19 olemarkus Exp $ |
| 27 |
# |
| 28 |
# Author: Tal Peer <coredumb@g.o> |
| 29 |
# Author: Stuart Herbert <stuart@g.o> |
| 30 |
@@ -16,7 +16,7 @@ |
| 31 |
# This eclass provides a unified interface for compiling and installing standalone |
| 32 |
# PHP extensions (modules). |
| 33 |
|
| 34 |
-inherit flag-o-matic autotools depend.php |
| 35 |
+inherit flag-o-matic autotools |
| 36 |
|
| 37 |
EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install |
| 38 |
|
| 39 |
@@ -197,6 +197,7 @@ |
| 40 |
PHP_PKG="$(best_version =dev-lang/php-${1:3}*)" |
| 41 |
PHPPREFIX="/usr/${libdir}/${slot}" |
| 42 |
EXT_DIR="$(${PHPCONFIG} --extension-dir 2>/dev/null)" |
| 43 |
+ PHP_CURRENTSLOT=${1:3} |
| 44 |
|
| 45 |
S="${WORKDIR}/${1}" |
| 46 |
cd "${S}" |
| 47 |
@@ -251,15 +252,15 @@ |
| 48 |
if [[ "${PHP_EXT_ZENDEXT}" = "yes" ]] ; then |
| 49 |
# We need the full path for ZendEngine extensions |
| 50 |
# and we need to check for debugging enabled! |
| 51 |
- if has_zts ; then |
| 52 |
- if has_debug ; then |
| 53 |
+ if has_version "dev-lang/php:${PHP_CURRENTSLOT}[threads]" ; then |
| 54 |
+ if has_version "dev-lang/php:${PHP_CURRENTSLOT}[debug]" ; then |
| 55 |
ext_type="zend_extension_debug_ts" |
| 56 |
else |
| 57 |
ext_type="zend_extension_ts" |
| 58 |
fi |
| 59 |
ext_file="${EXT_DIR}/${1}" |
| 60 |
else |
| 61 |
- if has_debug ; then |
| 62 |
+ if has_version "dev-lang/php:${PHP_CURRENTSLOT}[debug]"; then |
| 63 |
ext_type="zend_extension_debug" |
| 64 |
else |
| 65 |
ext_type="zend_extension" |
Archives