| 1 |
olemarkus 10/10/06 19:58:45 |
| 2 |
|
| 3 |
Modified: php-ext-pecl-r1.eclass php-ext-pecl-r2.eclass |
| 4 |
php-ext-source-r2.eclass |
| 5 |
Log: |
| 6 |
Added die to emake test in php-ext-pecl- |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.13 eclass/php-ext-pecl-r1.eclass |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-ext-pecl-r1.eclass?rev=1.13&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-ext-pecl-r1.eclass?rev=1.13&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-ext-pecl-r1.eclass?r1=1.12&r2=1.13 |
| 14 |
|
| 15 |
Index: php-ext-pecl-r1.eclass |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/eclass/php-ext-pecl-r1.eclass,v |
| 18 |
retrieving revision 1.12 |
| 19 |
retrieving revision 1.13 |
| 20 |
diff -u -r1.12 -r1.13 |
| 21 |
--- php-ext-pecl-r1.eclass 13 Sep 2010 13:44:14 -0000 1.12 |
| 22 |
+++ php-ext-pecl-r1.eclass 6 Oct 2010 19:58:45 -0000 1.13 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2007 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-pecl-r1.eclass,v 1.12 2010/09/13 13:44:14 mabi Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-pecl-r1.eclass,v 1.13 2010/10/06 19:58:45 olemarkus Exp $ |
| 28 |
# |
| 29 |
# Author: Tal Peer <coredumb@g.o> |
| 30 |
# Author: Luca Longinotti <chtekk@g.o> |
| 31 |
@@ -99,5 +99,5 @@ |
| 32 |
# away from there in src_compile |
| 33 |
ln -s "${WORKDIR}/${PHP_EXT_NAME}-default.so" "${S}/modules/${PHP_EXT_NAME}.so" |
| 34 |
|
| 35 |
- NO_INTERACTION="yes" emake test |
| 36 |
+ NO_INTERACTION="yes" emake test || die "emake test failed" |
| 37 |
} |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.2 eclass/php-ext-pecl-r2.eclass |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-ext-pecl-r2.eclass?rev=1.2&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-ext-pecl-r2.eclass?rev=1.2&content-type=text/plain |
| 45 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-ext-pecl-r2.eclass?r1=1.1&r2=1.2 |
| 46 |
|
| 47 |
Index: php-ext-pecl-r2.eclass |
| 48 |
=================================================================== |
| 49 |
RCS file: /var/cvsroot/gentoo-x86/eclass/php-ext-pecl-r2.eclass,v |
| 50 |
retrieving revision 1.1 |
| 51 |
retrieving revision 1.2 |
| 52 |
diff -u -r1.1 -r1.2 |
| 53 |
--- php-ext-pecl-r2.eclass 6 Oct 2010 08:25:51 -0000 1.1 |
| 54 |
+++ php-ext-pecl-r2.eclass 6 Oct 2010 19:58:45 -0000 1.2 |
| 55 |
@@ -1,6 +1,6 @@ |
| 56 |
# Copyright 1999-2007 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-pecl-r2.eclass,v 1.1 2010/10/06 08:25:51 olemarkus Exp $ |
| 59 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-pecl-r2.eclass,v 1.2 2010/10/06 19:58:45 olemarkus Exp $ |
| 60 |
# |
| 61 |
# Author: Tal Peer <coredumb@g.o> |
| 62 |
# Author: Luca Longinotti <chtekk@g.o> |
| 63 |
@@ -96,7 +96,7 @@ |
| 64 |
php-ext-pecl-r2_src_test() { |
| 65 |
|
| 66 |
for slot in `php_get_slots`; do |
| 67 |
- NO_INTERACTION="yes" emake test |
| 68 |
+ NO_INTERACTION="yes" emake test || die "emake test failed for slot ${slot}" |
| 69 |
done |
| 70 |
|
| 71 |
} |
| 72 |
|
| 73 |
|
| 74 |
|
| 75 |
1.2 eclass/php-ext-source-r2.eclass |
| 76 |
|
| 77 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-ext-source-r2.eclass?rev=1.2&view=markup |
| 78 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-ext-source-r2.eclass?rev=1.2&content-type=text/plain |
| 79 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-ext-source-r2.eclass?r1=1.1&r2=1.2 |
| 80 |
|
| 81 |
Index: php-ext-source-r2.eclass |
| 82 |
=================================================================== |
| 83 |
RCS file: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v |
| 84 |
retrieving revision 1.1 |
| 85 |
retrieving revision 1.2 |
| 86 |
diff -u -r1.1 -r1.2 |
| 87 |
--- php-ext-source-r2.eclass 6 Oct 2010 08:25:51 -0000 1.1 |
| 88 |
+++ php-ext-source-r2.eclass 6 Oct 2010 19:58:45 -0000 1.2 |
| 89 |
@@ -1,6 +1,6 @@ |
| 90 |
# Copyright 1999-2007 Gentoo Foundation |
| 91 |
# Distributed under the terms of the GNU General Public License v2 |
| 92 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.1 2010/10/06 08:25:51 olemarkus Exp $ |
| 93 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.2 2010/10/06 19:58:45 olemarkus Exp $ |
| 94 |
# |
| 95 |
# Author: Tal Peer <coredumb@g.o> |
| 96 |
# Author: Stuart Herbert <stuart@g.o> |
| 97 |
@@ -62,17 +62,15 @@ |
| 98 |
# Lists the PHP slots compatibile the extension is compatibile with |
| 99 |
[[ -z "$USE_PHP" ]] && USE_PHP="php5-2 php5-3" |
| 100 |
|
| 101 |
-for target in $USE_PHP; do |
| 102 |
- IUSE="${IUSE} php_targets_$target" |
| 103 |
-done |
| 104 |
- |
| 105 |
#Make sure at least one target is installed. Abuses USE dependencies. |
| 106 |
for target in $USE_PHP; do |
| 107 |
+ IUSE="${IUSE} php_targets_$target" |
| 108 |
target=${target/+} |
| 109 |
SELFDEPEND="$SELFDEPEND =$CATEGORY/$PF[php_targets_$target]" |
| 110 |
slot=${target/php} |
| 111 |
slot=${slot/-/.} |
| 112 |
- PHPDEPEND="$PHPDEPEND php_target_$target? ( dev-lang/php:${slot} )" |
| 113 |
+ PHPDEPEND="$PHPDEPEND |
| 114 |
+ php_targets_$target? ( dev-lang/php:${slot} )" |
| 115 |
done |
| 116 |
|
| 117 |
RDEPEND="${RDEPEND} |
Archives