| 1 |
commit: 7d8dc5bcc9d2b25bd68a27c50239390e9a81265b |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 9 03:14:25 2016 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 9 03:14:25 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=7d8dc5bc |
| 7 |
|
| 8 |
mozcoreconf-v4.eclass: honour toolchain even for build tools |
| 9 |
|
| 10 |
HOST_CC and HOST_CXX are used to build tools like nsinstall which are needed |
| 11 |
to install later on. Until now, these values were undefined and for whatever |
| 12 |
reason were never autodetected to match the CHOST based tools. This commit |
| 13 |
should resolve that issue. |
| 14 |
|
| 15 |
Other minor cleanups to eclass also occurred |
| 16 |
|
| 17 |
Bug: http://bugs.gentoo.org/565124 |
| 18 |
|
| 19 |
eclass/mozcoreconf-v4.eclass | 12 +++++++----- |
| 20 |
1 file changed, 7 insertions(+), 5 deletions(-) |
| 21 |
|
| 22 |
diff --git a/eclass/mozcoreconf-v4.eclass b/eclass/mozcoreconf-v4.eclass |
| 23 |
index e6771cc..3a43905 100644 |
| 24 |
--- a/eclass/mozcoreconf-v4.eclass |
| 25 |
+++ b/eclass/mozcoreconf-v4.eclass |
| 26 |
@@ -2,20 +2,20 @@ |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
# $Id$ |
| 29 |
# |
| 30 |
-# @ECLASS: mozcoreconf.eclass |
| 31 |
+# @ECLASS: mozcoreconf-v4.eclass |
| 32 |
# @MAINTAINER: |
| 33 |
# Mozilla team <mozilla@g.o> |
| 34 |
# @BLURB: core options and configuration functions for mozilla |
| 35 |
# @DESCRIPTION: |
| 36 |
# |
| 37 |
-# inherit mozconfig-v5.* or above for mozilla configuration support |
| 38 |
+# inherit mozconfig-v6.* or above for mozilla configuration support |
| 39 |
|
| 40 |
# @ECLASS-VARIABLE: MOZILLA_FIVE_HOME |
| 41 |
-# @DESCCRIPTION: |
| 42 |
+# @DESCRIPTION: |
| 43 |
# This is an eclass-generated variable that defines the rpath that the mozilla |
| 44 |
# product will be installed in. Read-only |
| 45 |
|
| 46 |
-if [[ ! ${_MOZCORECONF_V3} ]]; then |
| 47 |
+if [[ ! ${_MOZCORECONF} ]]; then |
| 48 |
|
| 49 |
PYTHON_COMPAT=( python2_7 ) |
| 50 |
PYTHON_REQ_USE='ncurses,sqlite,ssl,threads' |
| 51 |
@@ -86,6 +86,8 @@ moz_pkgsetup() { |
| 52 |
export LC_CTYPE="C" |
| 53 |
|
| 54 |
# Ensure we use correct toolchain |
| 55 |
+ export HOST_CC="$(tc-getBUILD_CC)" |
| 56 |
+ export HOST_CXX="$(tc-getBUILD_CXX)" |
| 57 |
tc-export CC CXX LD PKG_CONFIG |
| 58 |
|
| 59 |
# Ensure that we have a sane build enviroment |
| 60 |
@@ -263,5 +265,5 @@ mozconfig_final() { |
| 61 |
echo "ac_add_options --enable-extensions=${exts// /,}" >> .mozconfig |
| 62 |
} |
| 63 |
|
| 64 |
-_MOZCORECONF_V3=1 |
| 65 |
+_MOZCORECONF=1 |
| 66 |
fi |
Archives