[gentoo-commits] proj/mozilla:master commit in: eclass/

[Ian Stakenvicius]

commit:     3ab1892587300864ec2a82515bb479900137f6fb
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  8 13:22:40 2016 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Sep  8 22:16:27 2016 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=3ab18925

Ensure --host is always set, bug 590498

 eclass/mozconfig-v6.46.eclass | 6 ++----
 eclass/mozconfig-v6.47.eclass | 6 ++----
 eclass/mozconfig-v6.48.eclass | 6 ++----
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/eclass/mozconfig-v6.46.eclass b/eclass/mozconfig-v6.46.eclass
index 3a481e5..7b8c901 100644
--- a/eclass/mozconfig-v6.46.eclass
+++ b/eclass/mozconfig-v6.46.eclass
@@ -334,11 +334,9 @@ mozconfig_config() {
        # Instead of the standard --build= and --host=, mozilla uses --host 
instead
        # of --build, and --target intstead of --host.
        # Note, mozilla also has --build but it does not do what you think it 
does.
+       # Set both --target and --host as mozilla uses python to guess values 
otherwise
        mozconfig_annotate '' --target="${CHOST}"
-       if [[ "${CBUILD:-${CHOST}}" != "${CHOST}" ]]; then
-               # set --host only when cross-compiling
-               mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
-       fi
+       mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
 
        use ffmpeg || mozconfig_annotate '-ffmpeg' --disable-ffmpeg
        mozconfig_use_enable pulseaudio

diff --git a/eclass/mozconfig-v6.47.eclass b/eclass/mozconfig-v6.47.eclass
index ab0803f..5d52d7c 100644
--- a/eclass/mozconfig-v6.47.eclass
+++ b/eclass/mozconfig-v6.47.eclass
@@ -347,11 +347,9 @@ mozconfig_config() {
        # Instead of the standard --build= and --host=, mozilla uses --host 
instead
        # of --build, and --target intstead of --host.
        # Note, mozilla also has --build but it does not do what you think it 
does.
+       # Set both --target and --host as mozilla uses python to guess values 
otherwise
        mozconfig_annotate '' --target="${CHOST}"
-       if [[ "${CBUILD:-${CHOST}}" != "${CHOST}" ]]; then
-               # set --host only when cross-compiling
-               mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
-       fi
+       mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
 
        mozconfig_use_enable pulseaudio
 

diff --git a/eclass/mozconfig-v6.48.eclass b/eclass/mozconfig-v6.48.eclass
index 9eea075..0c3197d 100644
--- a/eclass/mozconfig-v6.48.eclass
+++ b/eclass/mozconfig-v6.48.eclass
@@ -328,11 +328,9 @@ mozconfig_config() {
        # Instead of the standard --build= and --host=, mozilla uses --host 
instead
        # of --build, and --target intstead of --host.
        # Note, mozilla also has --build but it does not do what you think it 
does.
+       # Set both --target and --host as mozilla uses python to guess values 
otherwise
        mozconfig_annotate '' --target="${CHOST}"
-       if [[ "${CBUILD:-${CHOST}}" != "${CHOST}" ]]; then
-               # set --host only when cross-compiling
-               mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
-       fi
+       mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
 
        mozconfig_use_enable pulseaudio