Skip to content

Commit

Permalink
dev-lang/php: use "+=" consistently for appending to $my_conf.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
orlitzky committed Oct 31, 2015
1 parent 24cc464 commit e48d909
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions dev-lang/php/php-5.6.15.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -497,20 +497,20 @@ 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.
# Changed order to run it in reverse for bug #32022 and #12021.
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
Expand Down
8 changes: 4 additions & 4 deletions dev-lang/php/php-7.0.0_rc5.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -473,20 +473,20 @@ 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.
# Changed order to run it in reverse for bug #32022 and #12021.
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
Expand Down

0 comments on commit e48d909

Please sign in to comment.