| 1 |
commit: ea950c9bba466d6c89d808c5e82572035ab43455 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 5 23:08:15 2018 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 6 00:44:14 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea950c9b |
| 7 |
|
| 8 |
mozcoreconf-v6.eclass: synchronize with changes from mozilla overlay |
| 9 |
|
| 10 |
eclass/mozcoreconf-v6.eclass | 18 +++++++++++++++--- |
| 11 |
1 file changed, 15 insertions(+), 3 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/mozcoreconf-v6.eclass b/eclass/mozcoreconf-v6.eclass |
| 14 |
index 403740c1241..930122fc886 100644 |
| 15 |
--- a/eclass/mozcoreconf-v6.eclass |
| 16 |
+++ b/eclass/mozcoreconf-v6.eclass |
| 17 |
@@ -1,7 +1,7 @@ |
| 18 |
-# Copyright 1999-2017 Gentoo Foundation |
| 19 |
+# Copyright 1999-2018 Gentoo Foundation |
| 20 |
# Distributed under the terms of the GNU General Public License v2 |
| 21 |
# |
| 22 |
-# @ECLASS: mozcoreconf-v5.eclass |
| 23 |
+# @ECLASS: mozcoreconf-v6.eclass |
| 24 |
# @MAINTAINER: |
| 25 |
# Mozilla team <mozilla@g.o> |
| 26 |
# @BLURB: core options and configuration functions for mozilla |
| 27 |
@@ -16,8 +16,11 @@ |
| 28 |
|
| 29 |
if [[ ! ${_MOZCORECONF} ]]; then |
| 30 |
|
| 31 |
+# for compatibility with packages prior to v1 |
| 32 |
+if [[ -z ${PYTHON_COMPAT[@]} ]]; then |
| 33 |
PYTHON_COMPAT=( python2_7 ) |
| 34 |
PYTHON_REQ_USE='ncurses,sqlite,ssl,threads' |
| 35 |
+fi |
| 36 |
|
| 37 |
inherit multilib toolchain-funcs flag-o-matic python-any-r1 versionator |
| 38 |
|
| 39 |
@@ -112,6 +115,11 @@ moz_pkgsetup() { |
| 40 |
fi |
| 41 |
|
| 42 |
python-any-r1_pkg_setup |
| 43 |
+ # workaround to set python3 into PYTHON3 until mozilla doesn't need py2 |
| 44 |
+ if [[ "${PYTHON_COMPAT[@]}" != "${PYTHON_COMPAT[@]#python3*}" ]]; then |
| 45 |
+ export PYTHON3=${PYTHON} |
| 46 |
+ python_export python2_7 PYTHON EPYTHON |
| 47 |
+ fi |
| 48 |
} |
| 49 |
|
| 50 |
# @FUNCTION: mozconfig_init |
| 51 |
@@ -124,6 +132,7 @@ mozconfig_init() { |
| 52 |
declare FF=$([[ ${PN} == firefox ]] && echo true || echo false) |
| 53 |
declare SM=$([[ ${PN} == seamonkey ]] && echo true || echo false) |
| 54 |
declare TB=$([[ ${PN} == thunderbird ]] && echo true || echo false) |
| 55 |
+ declare TRB=$([[ ${PN} == torbrowser ]] && echo true || echo false) |
| 56 |
|
| 57 |
#################################### |
| 58 |
# |
| 59 |
@@ -139,6 +148,9 @@ mozconfig_init() { |
| 60 |
*firefox) |
| 61 |
cp browser/config/mozconfig .mozconfig \ |
| 62 |
|| die "cp browser/config/mozconfig failed" ;; |
| 63 |
+ *torbrowser) |
| 64 |
+ cp browser/config/mozconfig .mozconfig \ |
| 65 |
+ || die "cp browser/config/mozconfig failed" ;; |
| 66 |
seamonkey) |
| 67 |
# Must create the initial mozconfig to enable application |
| 68 |
: >.mozconfig || die "initial mozconfig creation failed" |
| 69 |
@@ -158,7 +170,7 @@ mozconfig_init() { |
| 70 |
#################################### |
| 71 |
|
| 72 |
# Set optimization level |
| 73 |
- if [[ $(gcc-major-version) -ge 7 ]]; then |
| 74 |
+ if [[ $(gcc-major-version) -eq 7 ]]; then |
| 75 |
mozconfig_annotate "Workaround known breakage" --enable-optimize=-O2 |
| 76 |
elif [[ ${ARCH} == hppa ]]; then |
| 77 |
mozconfig_annotate "more than -O0 causes a segfault on hppa" --enable-optimize=-O0 |
Archives