diff options
| author |   Jory Pratt <anarchy@gentoo.org> | 2006-01-04 01:30:52 +0000 |
|---|---|---|
| committer | Jory Pratt <anarchy@gentoo.org> | 2006-01-04 01:30:52 +0000 |
| commit | 5fd552c6e8fbfee4311cb0bd176432b4124126b8 (patch) | |
| tree | b387ea3f7fbb7d866b873a0f213fba29f1609cf6 /eclass/mozcoreconf.eclass | |
| parent | Added ~amd64 keyword. (diff) | |
| download | historical-5fd552c6e8fbfee4311cb0bd176432b4124126b8.tar.gz historical-5fd552c6e8fbfee4311cb0bd176432b4124126b8.tar.bz2 historical-5fd552c6e8fbfee4311cb0bd176432b4124126b8.zip | |
fixed duplication in code in mozcoreconf
Diffstat (limited to 'eclass/mozcoreconf.eclass')
| -rw-r--r-- | eclass/mozcoreconf.eclass | 45 |
1 files changed, 1 insertions, 44 deletions
diff --git a/eclass/mozcoreconf.eclass b/eclass/mozcoreconf.eclass index 4fd628a73421..dfe6b26804cf 100644 --- a/eclass/mozcoreconf.eclass +++ b/eclass/mozcoreconf.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mozcoreconf.eclass,v 1.3 2005/12/23 03:46:49 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mozcoreconf.eclass,v 1.4 2006/01/04 01:30:52 anarchy Exp $ # # mozcoreconf.eclass : core options for mozilla # inherit mozconfig-2 if you need USE flags @@ -249,46 +249,3 @@ mozconfig_final() { sed -i '/^ac_add_options --enable-extensions/d' .mozconfig echo "ac_add_options --enable-extensions=${exts// /,}" >> .mozconfig } - -# mozconfig_final: display a table describing all configuration options paired -# with reasons, then clean up extensions list -mozconfig_final() { - declare ac opt hash reason - echo - echo "==========================================================" - echo "Building ${PF} with the following configuration" - grep ^ac_add_options .mozconfig | while read ac opt hash reason; do - [[ -z ${hash} || ${hash} == \# ]] \ - || die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}" - printf " %-30s %s\n" "${opt}" "${reason:-mozilla.org default}" - done - echo "==========================================================" - echo - - # Resolve multiple --enable-extensions down to one - declare exts=$(sed -n 's/^ac_add_options --enable-extensions=\([^ ]*\).*/\1/p' \ - .mozconfig | xargs) - sed -i '/^ac_add_options --enable-extensions/d' .mozconfig - echo "ac_add_options --enable-extensions=${exts// /,}" >> .mozconfig -} -# mozconfig_final: display a table describing all configuration options paired -# with reasons, then clean up extensions list -mozconfig_final() { - declare ac opt hash reason - echo - echo "==========================================================" - echo "Building ${PF} with the following configuration" - grep ^ac_add_options .mozconfig | while read ac opt hash reason; do - [[ -z ${hash} || ${hash} == \# ]] \ - || die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}" - printf " %-30s %s\n" "${opt}" "${reason:-mozilla.org default}" - done - echo "==========================================================" - echo - - # Resolve multiple --enable-extensions down to one - declare exts=$(sed -n 's/^ac_add_options --enable-extensions=\([^ ]*\).*/\1/p' \ - .mozconfig | xargs) - sed -i '/^ac_add_options --enable-extensions/d' .mozconfig - echo "ac_add_options --enable-extensions=${exts// /,}" >> .mozconfig -} |