| 1 |
commit: e48d9099900a273376b3cd0aa2de7d72b0c0e38d |
| 2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 31 01:10:38 2015 +0000 |
| 4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 31 02:21:43 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e48d9099 |
| 7 |
|
| 8 |
dev-lang/php: use "+=" consistently for appending to $my_conf. |
| 9 |
|
| 10 |
There were a few places still using my_conf="${my_conf} ..." to append |
| 11 |
to the my_conf variable. Update them all to use the "append" operator. |
| 12 |
|
| 13 |
Gentoo-Bug: 551526 |
| 14 |
|
| 15 |
Package-Manager: portage-2.2.20.1 |
| 16 |
|
| 17 |
dev-lang/php/php-5.6.15.ebuild | 8 ++++---- |
| 18 |
dev-lang/php/php-7.0.0_rc5.ebuild | 8 ++++---- |
| 19 |
2 files changed, 8 insertions(+), 8 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-lang/php/php-5.6.15.ebuild b/dev-lang/php/php-5.6.15.ebuild |
| 22 |
index 7fc954c..776f4f9 100644 |
| 23 |
--- a/dev-lang/php/php-5.6.15.ebuild |
| 24 |
+++ b/dev-lang/php/php-5.6.15.ebuild |
| 25 |
@@ -403,7 +403,7 @@ src_configure() { |
| 26 |
# DBA support |
| 27 |
if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ |
| 28 |
|| use qdbm ; then |
| 29 |
- my_conf="${my_conf} --enable-dba${shared}" |
| 30 |
+ my_conf+=" --enable-dba${shared}" |
| 31 |
fi |
| 32 |
|
| 33 |
# DBA drivers support |
| 34 |
@@ -497,12 +497,12 @@ src_configure() { |
| 35 |
fi |
| 36 |
|
| 37 |
# Use pic for shared modules such as apache2's mod_php |
| 38 |
- my_conf="${my_conf} --with-pic" |
| 39 |
+ my_conf+=" --with-pic" |
| 40 |
|
| 41 |
# we use the system copy of pcre |
| 42 |
# --with-pcre-regex affects ext/pcre |
| 43 |
# --with-pcre-dir affects ext/filter and ext/zip |
| 44 |
- my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr" |
| 45 |
+ my_conf+=" --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr" |
| 46 |
|
| 47 |
# Catch CFLAGS problems |
| 48 |
# Fixes bug #14067. |
| 49 |
@@ -510,7 +510,7 @@ src_configure() { |
| 50 |
replace-cpu-flags "k6*" "i586" |
| 51 |
|
| 52 |
# Support user-passed configuration parameters |
| 53 |
- my_conf="${my_conf} ${EXTRA_ECONF:-}" |
| 54 |
+ my_conf+=" ${EXTRA_ECONF:-}" |
| 55 |
|
| 56 |
# Support the Apache2 extras, they must be set globally for all |
| 57 |
# SAPIs to work correctly, especially for external PHP extensions |
| 58 |
|
| 59 |
diff --git a/dev-lang/php/php-7.0.0_rc5.ebuild b/dev-lang/php/php-7.0.0_rc5.ebuild |
| 60 |
index 41ebf46..5dd58ce 100644 |
| 61 |
--- a/dev-lang/php/php-7.0.0_rc5.ebuild |
| 62 |
+++ b/dev-lang/php/php-7.0.0_rc5.ebuild |
| 63 |
@@ -384,7 +384,7 @@ src_configure() { |
| 64 |
# DBA support |
| 65 |
if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ |
| 66 |
|| use qdbm ; then |
| 67 |
- my_conf="${my_conf} --enable-dba${shared}" |
| 68 |
+ my_conf+=" --enable-dba${shared}" |
| 69 |
fi |
| 70 |
|
| 71 |
# DBA drivers support |
| 72 |
@@ -473,12 +473,12 @@ src_configure() { |
| 73 |
fi |
| 74 |
|
| 75 |
# Use pic for shared modules such as apache2's mod_php |
| 76 |
- my_conf="${my_conf} --with-pic" |
| 77 |
+ my_conf+=" --with-pic" |
| 78 |
|
| 79 |
# we use the system copy of pcre |
| 80 |
# --with-pcre-regex affects ext/pcre |
| 81 |
# --with-pcre-dir affects ext/filter and ext/zip |
| 82 |
- my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr" |
| 83 |
+ my_conf+=" --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr" |
| 84 |
|
| 85 |
# Catch CFLAGS problems |
| 86 |
# Fixes bug #14067. |
| 87 |
@@ -486,7 +486,7 @@ src_configure() { |
| 88 |
replace-cpu-flags "k6*" "i586" |
| 89 |
|
| 90 |
# Support user-passed configuration parameters |
| 91 |
- my_conf="${my_conf} ${EXTRA_ECONF:-}" |
| 92 |
+ my_conf+=" ${EXTRA_ECONF:-}" |
| 93 |
|
| 94 |
# Support the Apache2 extras, they must be set globally for all |
| 95 |
# SAPIs to work correctly, especially for external PHP extensions |
Archives