| 1 |
commit: 655430e94e42aa39e99c3701f326eb1eb431b438 |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 27 19:09:40 2014 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 27 19:09:40 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=655430e9 |
| 7 |
|
| 8 |
Minor fixes to mozconfig-v5.34.eclass |
| 9 |
|
| 10 |
Based on what I could gleam from configure.in, it seems that debug-symbols are |
| 11 |
default-disabled rather than default-enabled ; added a flag to enable them if |
| 12 |
USE="debug" is set. |
| 13 |
|
| 14 |
Also discovered that mozcoreconf disables jemalloc unless glibc >= 2.4 is |
| 15 |
installed. Added a wrapper to keep jemalloc from being enabled except |
| 16 |
when glibc >= 2.4 is installed to mozconfig-v5.34 , since it would override |
| 17 |
the mozcoreconf setting. |
| 18 |
|
| 19 |
--- |
| 20 |
eclass/mozconfig-v5.34.eclass | 13 +++++++++---- |
| 21 |
1 file changed, 9 insertions(+), 4 deletions(-) |
| 22 |
|
| 23 |
diff --git a/eclass/mozconfig-v5.34.eclass b/eclass/mozconfig-v5.34.eclass |
| 24 |
index d70fc8d..7c45cdf 100644 |
| 25 |
--- a/eclass/mozconfig-v5.34.eclass |
| 26 |
+++ b/eclass/mozconfig-v5.34.eclass |
| 27 |
@@ -152,6 +152,8 @@ mozconfig_config() { |
| 28 |
|
| 29 |
if ! use debug ; then |
| 30 |
mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols |
| 31 |
+ else |
| 32 |
+ mozconfig_annotate 'disabled by Gentoo' --enable-debug-symbols |
| 33 |
fi |
| 34 |
|
| 35 |
mozconfig_use_enable startup-notification |
| 36 |
@@ -196,10 +198,13 @@ mozconfig_config() { |
| 37 |
mozconfig_annotate 'Gentoo default to honor system linker' --disable-gold |
| 38 |
mozconfig_annotate '' --disable-gconf |
| 39 |
|
| 40 |
- # We must force-enable jemalloc 3 via .mozconfig |
| 41 |
- echo "export MOZ_JEMALLOC=1" >> "${S}"/.mozconfig || die |
| 42 |
- mozconfig_annotate '' --enable-jemalloc |
| 43 |
- mozconfig_annotate '' --enable-replace-malloc |
| 44 |
+ # Use jemalloc unless libc is not glibc >= 2.4 |
| 45 |
+ if has_version ">=sys-libs/glibc-2.4"; then |
| 46 |
+ # We must force-enable jemalloc 3 via .mozconfig |
| 47 |
+ echo "export MOZ_JEMALLOC3=1" >> "${S}"/.mozconfig || die |
| 48 |
+ mozconfig_annotate '' --enable-jemalloc |
| 49 |
+ mozconfig_annotate '' --enable-replace-malloc |
| 50 |
+ fi |
| 51 |
|
| 52 |
mozconfig_annotate '' --target="${CTARGET:-${CHOST}}" |
| 53 |
mozconfig_annotate '' --build="${CTARGET:-${CHOST}}" |
Archives