[gentoo-commits] proj/mozilla:master commit in: eclass/

[Ian Stakenvicius]

commit:     655430e94e42aa39e99c3701f326eb1eb431b438
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 27 19:09:40 2014 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Mon Oct 27 19:09:40 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=655430e9

Minor fixes to mozconfig-v5.34.eclass

Based on what I could gleam from configure.in, it seems that debug-symbols are
default-disabled rather than default-enabled ; added a flag to enable them if
USE="debug" is set.

Also discovered that mozcoreconf disables jemalloc unless glibc >= 2.4 is
installed.  Added a wrapper to keep jemalloc from being enabled except
when glibc >= 2.4 is installed to mozconfig-v5.34 , since it would override
the mozcoreconf setting.

---
 eclass/mozconfig-v5.34.eclass | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/eclass/mozconfig-v5.34.eclass b/eclass/mozconfig-v5.34.eclass
index d70fc8d..7c45cdf 100644
--- a/eclass/mozconfig-v5.34.eclass
+++ b/eclass/mozconfig-v5.34.eclass
@@ -152,6 +152,8 @@ mozconfig_config() {
 
        if ! use debug ; then
                mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
+       else
+               mozconfig_annotate 'disabled by Gentoo' --enable-debug-symbols
        fi
 
        mozconfig_use_enable startup-notification
@@ -196,10 +198,13 @@ mozconfig_config() {
        mozconfig_annotate 'Gentoo default to honor system linker' 
--disable-gold
        mozconfig_annotate '' --disable-gconf
 
-       # We must force-enable jemalloc 3 via .mozconfig
-       echo "export MOZ_JEMALLOC=1" >> "${S}"/.mozconfig || die
-       mozconfig_annotate '' --enable-jemalloc
-       mozconfig_annotate '' --enable-replace-malloc
+       # Use jemalloc unless libc is not glibc >= 2.4
+       if has_version ">=sys-libs/glibc-2.4"; then
+               # We must force-enable jemalloc 3 via .mozconfig
+               echo "export MOZ_JEMALLOC3=1" >> "${S}"/.mozconfig || die
+               mozconfig_annotate '' --enable-jemalloc
+               mozconfig_annotate '' --enable-replace-malloc
+       fi
 
        mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
        mozconfig_annotate '' --build="${CTARGET:-${CHOST}}"