| 1 |
commit: f0095d3e43cd2dc2828300d0c2e36504b6465880 |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 5 15:05:16 2016 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 6 21:24:52 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0095d3e |
| 7 |
|
| 8 |
eclass/moz*: refactor some configuration options from mozcoreconf-v4 to mozconfig |
| 9 |
|
| 10 |
mozilla-48 and newer have dropped some configuration options that are no longer used |
| 11 |
in the build system, and due to the way the new python configure operates, any options |
| 12 |
specified that are not recognized are fatal. Moving these options out of mozcoreconf |
| 13 |
allows the older mozconfig's to retain the same configuration while also allowing newer |
| 14 |
mozconfig's to drop them as appropriate. |
| 15 |
|
| 16 |
eclass/mozconfig-v6.45.eclass | 15 ++++++++++++++- |
| 17 |
eclass/mozconfig-v6.47.eclass | 15 ++++++++++++++- |
| 18 |
eclass/mozcoreconf-v4.eclass | 14 ++------------ |
| 19 |
3 files changed, 30 insertions(+), 14 deletions(-) |
| 20 |
|
| 21 |
diff --git a/eclass/mozconfig-v6.45.eclass b/eclass/mozconfig-v6.45.eclass |
| 22 |
index e92f769..02890a3 100644 |
| 23 |
--- a/eclass/mozconfig-v6.45.eclass |
| 24 |
+++ b/eclass/mozconfig-v6.45.eclass |
| 25 |
@@ -15,7 +15,7 @@ |
| 26 |
# Some use flags which may be optional in particular mozilla packages can be |
| 27 |
# supported through setting eclass variables. |
| 28 |
# |
| 29 |
-# This eclass inherits mozconfig helper functions as defined in mozcoreconf-v3, |
| 30 |
+# This eclass inherits mozconfig helper functions as defined in mozcoreconf-v4, |
| 31 |
# and so ebuilds inheriting this eclass do not need to inherit that. |
| 32 |
|
| 33 |
case ${EAPI} in |
| 34 |
@@ -216,6 +216,19 @@ REQUIRED_USE=" |
| 35 |
# } |
| 36 |
|
| 37 |
mozconfig_config() { |
| 38 |
+ # Migrated from mozcoreconf-v3 |
| 39 |
+ mozconfig_annotate 'more disable_update_strip' \ |
| 40 |
+ --disable-pedantic \ |
| 41 |
+ --disable-installer \ |
| 42 |
+ --disable-strip-libs |
| 43 |
+ |
| 44 |
+ if [[ ${PN} != seamonkey ]]; then |
| 45 |
+ mozconfig_annotate 'basic_profile' \ |
| 46 |
+ --disable-profilelocking \ |
| 47 |
+ --enable-single-profile \ |
| 48 |
+ --disable-profilesharing |
| 49 |
+ fi |
| 50 |
+ |
| 51 |
# Migrated from mozcoreconf-2 |
| 52 |
mozconfig_annotate 'system_libs' \ |
| 53 |
--with-system-zlib \ |
| 54 |
|
| 55 |
diff --git a/eclass/mozconfig-v6.47.eclass b/eclass/mozconfig-v6.47.eclass |
| 56 |
index 263f4c0..ab0803f 100644 |
| 57 |
--- a/eclass/mozconfig-v6.47.eclass |
| 58 |
+++ b/eclass/mozconfig-v6.47.eclass |
| 59 |
@@ -15,7 +15,7 @@ |
| 60 |
# Some use flags which may be optional in particular mozilla packages can be |
| 61 |
# supported through setting eclass variables. |
| 62 |
# |
| 63 |
-# This eclass inherits mozconfig helper functions as defined in mozcoreconf-v3, |
| 64 |
+# This eclass inherits mozconfig helper functions as defined in mozcoreconf-v4, |
| 65 |
# and so ebuilds inheriting this eclass do not need to inherit that. |
| 66 |
|
| 67 |
case ${EAPI} in |
| 68 |
@@ -222,6 +222,19 @@ REQUIRED_USE=" |
| 69 |
# } |
| 70 |
|
| 71 |
mozconfig_config() { |
| 72 |
+ # Migrated from mozcoreconf-v3 |
| 73 |
+ mozconfig_annotate 'more disable_update_strip' \ |
| 74 |
+ --disable-pedantic \ |
| 75 |
+ --disable-installer \ |
| 76 |
+ --disable-strip-libs |
| 77 |
+ |
| 78 |
+ if [[ ${PN} != seamonkey ]]; then |
| 79 |
+ mozconfig_annotate 'basic_profile' \ |
| 80 |
+ --disable-profilelocking \ |
| 81 |
+ --enable-single-profile \ |
| 82 |
+ --disable-profilesharing |
| 83 |
+ fi |
| 84 |
+ |
| 85 |
# Migrated from mozcoreconf-2 |
| 86 |
mozconfig_annotate 'system_libs' \ |
| 87 |
--with-system-zlib \ |
| 88 |
|
| 89 |
diff --git a/eclass/mozcoreconf-v4.eclass b/eclass/mozcoreconf-v4.eclass |
| 90 |
index fc5a079..191f5fa 100644 |
| 91 |
--- a/eclass/mozcoreconf-v4.eclass |
| 92 |
+++ b/eclass/mozcoreconf-v4.eclass |
| 93 |
@@ -208,7 +208,7 @@ mozconfig_init() { |
| 94 |
append-flags "$MAKEEDIT_FLAGS" |
| 95 |
|
| 96 |
# Use the MOZILLA_FIVE_HOME for the rpath |
| 97 |
- append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}" |
| 98 |
+ append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags |
| 99 |
# Set MOZILLA_FIVE_HOME in mozconfig |
| 100 |
mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} |
| 101 |
|
| 102 |
@@ -219,19 +219,9 @@ mozconfig_init() { |
| 103 |
#################################### |
| 104 |
|
| 105 |
mozconfig_annotate disable_update_strip \ |
| 106 |
- --disable-pedantic \ |
| 107 |
--disable-updater \ |
| 108 |
--disable-strip \ |
| 109 |
- --disable-install-strip \ |
| 110 |
- --disable-installer \ |
| 111 |
- --disable-strip-libs |
| 112 |
- |
| 113 |
- if [[ ${PN} != seamonkey ]]; then |
| 114 |
- mozconfig_annotate basic_profile \ |
| 115 |
- --disable-profilelocking \ |
| 116 |
- --enable-single-profile \ |
| 117 |
- --disable-profilesharing |
| 118 |
- fi |
| 119 |
+ --disable-install-strip |
| 120 |
|
| 121 |
# Here is a strange one... |
| 122 |
if is-flag '-mcpu=ultrasparc*' || is-flag '-mtune=ultrasparc*'; then |
Archives