commit: 384d5109c2385903f80b2327f234d2d155b1e761
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 29 19:15:30 2016 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 19:15:30 2016 +0000
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=384d5109
refactor some configuration options from mozcoreconf-v4 to mozconfig
eclass/mozconfig-v6.45.eclass | 15 ++++++++++++++-
eclass/mozconfig-v6.47.eclass | 15 ++++++++++++++-
eclass/mozcoreconf-v4.eclass | 14 ++------------
3 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/eclass/mozconfig-v6.45.eclass b/eclass/mozconfig-v6.45.eclass
index 544321f..be5c49a 100644
--- a/eclass/mozconfig-v6.45.eclass
+++ b/eclass/mozconfig-v6.45.eclass
@@ -15,7 +15,7 @@
# Some use flags which may be optional in particular mozilla packages can be
# supported through setting eclass variables.
#
-# This eclass inherits mozconfig helper functions as defined in mozcoreconf-v3,
+# This eclass inherits mozconfig helper functions as defined in mozcoreconf-v4,
# and so ebuilds inheriting this eclass do not need to inherit that.
case ${EAPI} in
@@ -216,6 +216,19 @@ REQUIRED_USE="
# }
mozconfig_config() {
+ # Migrated from mozcoreconf-v3
+ mozconfig_annotate 'more disable_update_strip' \
+ --disable-pedantic \
+ --disable-installer \
+ --disable-strip-libs
+
+ if [[ ${PN} != seamonkey ]]; then
+ mozconfig_annotate 'basic_profile' \
+ --disable-profilelocking \
+ --enable-single-profile \
+ --disable-profilesharing
+ fi
+
# Migrated from mozcoreconf-2
mozconfig_annotate 'system_libs' \
--with-system-zlib \
diff --git a/eclass/mozconfig-v6.47.eclass b/eclass/mozconfig-v6.47.eclass
index 263f4c0..ab0803f 100644
--- a/eclass/mozconfig-v6.47.eclass
+++ b/eclass/mozconfig-v6.47.eclass
@@ -15,7 +15,7 @@
# Some use flags which may be optional in particular mozilla packages can be
# supported through setting eclass variables.
#
-# This eclass inherits mozconfig helper functions as defined in mozcoreconf-v3,
+# This eclass inherits mozconfig helper functions as defined in mozcoreconf-v4,
# and so ebuilds inheriting this eclass do not need to inherit that.
case ${EAPI} in
@@ -222,6 +222,19 @@ REQUIRED_USE="
# }
mozconfig_config() {
+ # Migrated from mozcoreconf-v3
+ mozconfig_annotate 'more disable_update_strip' \
+ --disable-pedantic \
+ --disable-installer \
+ --disable-strip-libs
+
+ if [[ ${PN} != seamonkey ]]; then
+ mozconfig_annotate 'basic_profile' \
+ --disable-profilelocking \
+ --enable-single-profile \
+ --disable-profilesharing
+ fi
+
# Migrated from mozcoreconf-2
mozconfig_annotate 'system_libs' \
--with-system-zlib \
diff --git a/eclass/mozcoreconf-v4.eclass b/eclass/mozcoreconf-v4.eclass
index 88f7b4b..e6771cc 100644
--- a/eclass/mozcoreconf-v4.eclass
+++ b/eclass/mozcoreconf-v4.eclass
@@ -208,7 +208,7 @@ mozconfig_init() {
append-flags "$MAKEEDIT_FLAGS"
# Use the MOZILLA_FIVE_HOME for the rpath
- append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}"
+ append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
# Set MOZILLA_FIVE_HOME in mozconfig
mozconfig_annotate ''
--with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
@@ -219,19 +219,9 @@ mozconfig_init() {
####################################
mozconfig_annotate disable_update_strip \
- --disable-pedantic \
--disable-updater \
--disable-strip \
- --disable-install-strip \
- --disable-installer \
- --disable-strip-libs
-
- if [[ ${PN} != seamonkey ]]; then
- mozconfig_annotate basic_profile \
- --disable-profilelocking \
- --enable-single-profile \
- --disable-profilesharing
- fi
+ --disable-install-strip
# Here is a strange one...
if is-flag '-mcpu=ultrasparc*' || is-flag '-mtune=ultrasparc*'; then
