commit: f0095d3e43cd2dc2828300d0c2e36504b6465880
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 5 15:05:16 2016 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Wed Jul 6 21:24:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0095d3e
eclass/moz*: refactor some configuration options from mozcoreconf-v4 to
mozconfig
mozilla-48 and newer have dropped some configuration options that are no longer
used
in the build system, and due to the way the new python configure operates, any
options
specified that are not recognized are fatal. Moving these options out of
mozcoreconf
allows the older mozconfig's to retain the same configuration while also
allowing newer
mozconfig's to drop them as appropriate.
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 e92f769..02890a3 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 fc5a079..191f5fa 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
