From e48d9099900a273376b3cd0aa2de7d72b0c0e38d Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Fri, 30 Oct 2015 21:10:38 -0400 Subject: dev-lang/php: use "+=" consistently for appending to $my_conf. There were a few places still using my_conf="${my_conf} ..." to append to the my_conf variable. Update them all to use the "append" operator. Gentoo-Bug: 551526 Package-Manager: portage-2.2.20.1 --- dev-lang/php/php-5.6.15.ebuild | 8 ++++---- dev-lang/php/php-7.0.0_rc5.ebuild | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dev-lang/php/php-5.6.15.ebuild b/dev-lang/php/php-5.6.15.ebuild index 7fc954ce6577..776f4f913228 100644 --- a/dev-lang/php/php-5.6.15.ebuild +++ b/dev-lang/php/php-5.6.15.ebuild @@ -403,7 +403,7 @@ src_configure() { # DBA support if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ || use qdbm ; then - my_conf="${my_conf} --enable-dba${shared}" + my_conf+=" --enable-dba${shared}" fi # DBA drivers support @@ -497,12 +497,12 @@ src_configure() { fi # Use pic for shared modules such as apache2's mod_php - my_conf="${my_conf} --with-pic" + my_conf+=" --with-pic" # we use the system copy of pcre # --with-pcre-regex affects ext/pcre # --with-pcre-dir affects ext/filter and ext/zip - my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr" + my_conf+=" --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr" # Catch CFLAGS problems # Fixes bug #14067. @@ -510,7 +510,7 @@ src_configure() { replace-cpu-flags "k6*" "i586" # Support user-passed configuration parameters - my_conf="${my_conf} ${EXTRA_ECONF:-}" + my_conf+=" ${EXTRA_ECONF:-}" # Support the Apache2 extras, they must be set globally for all # SAPIs to work correctly, especially for external PHP extensions diff --git a/dev-lang/php/php-7.0.0_rc5.ebuild b/dev-lang/php/php-7.0.0_rc5.ebuild index 41ebf46c0f1f..5dd58ce2c2e1 100644 --- a/dev-lang/php/php-7.0.0_rc5.ebuild +++ b/dev-lang/php/php-7.0.0_rc5.ebuild @@ -384,7 +384,7 @@ src_configure() { # DBA support if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ || use qdbm ; then - my_conf="${my_conf} --enable-dba${shared}" + my_conf+=" --enable-dba${shared}" fi # DBA drivers support @@ -473,12 +473,12 @@ src_configure() { fi # Use pic for shared modules such as apache2's mod_php - my_conf="${my_conf} --with-pic" + my_conf+=" --with-pic" # we use the system copy of pcre # --with-pcre-regex affects ext/pcre # --with-pcre-dir affects ext/filter and ext/zip - my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr" + my_conf+=" --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr" # Catch CFLAGS problems # Fixes bug #14067. @@ -486,7 +486,7 @@ src_configure() { replace-cpu-flags "k6*" "i586" # Support user-passed configuration parameters - my_conf="${my_conf} ${EXTRA_ECONF:-}" + my_conf+=" ${EXTRA_ECONF:-}" # Support the Apache2 extras, they must be set globally for all # SAPIs to work correctly, especially for external PHP extensions -- cgit v1.2.3-65-gdbad