aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin "Sardem FF7" Glidic <sardemff7.pub@gmail.com>2011-07-10 23:37:03 +0200
committerQuentin "Sardem FF7" Glidic <sardemff7.pub@gmail.com>2011-07-10 23:37:03 +0200
commit005447d96362ed4dbd632c6936d788548f141ca5 (patch)
treede5146722d37bfa5d1e11a19dbec00c9034d3e5e
parentRapid fix, thanks Keruspe (diff)
downloadsardemff7-005447d96362ed4dbd632c6936d788548f141ca5.tar.gz
sardemff7-005447d96362ed4dbd632c6936d788548f141ca5.tar.bz2
sardemff7-005447d96362ed4dbd632c6936d788548f141ca5.zip
mozilla-*.eclass: Use python at the right place
-rw-r--r--eclass/mozilla-app.eclass2
-rw-r--r--eclass/mozilla-scm-fetch.eclass2
-rw-r--r--eclass/mozilla-scm.eclass13
3 files changed, 13 insertions, 4 deletions
diff --git a/eclass/mozilla-app.eclass b/eclass/mozilla-app.eclass
index edb40e7..80e0502 100644
--- a/eclass/mozilla-app.eclass
+++ b/eclass/mozilla-app.eclass
@@ -9,7 +9,7 @@
WANT_AUTOCONF="2.1"
-inherit base multilib toolchain-funcs autotools python flag-o-matic pax-utils mozilla-scm
+inherit base multilib toolchain-funcs autotools flag-o-matic pax-utils mozilla-scm
S="${WORKDIR}/${XULRUNNER_HG_MODULE}"
diff --git a/eclass/mozilla-scm-fetch.eclass b/eclass/mozilla-scm-fetch.eclass
index f1654e7..7080247 100644
--- a/eclass/mozilla-scm-fetch.eclass
+++ b/eclass/mozilla-scm-fetch.eclass
@@ -134,8 +134,6 @@ function mozilla-scm-fetch_pkg_setup {
export LC_ALL="C"
export LC_MESSAGES="C"
export LC_CTYPE="C"
-
- python_set_active_version 2
}
##
diff --git a/eclass/mozilla-scm.eclass b/eclass/mozilla-scm.eclass
index b619fa5..ccd75b2 100644
--- a/eclass/mozilla-scm.eclass
+++ b/eclass/mozilla-scm.eclass
@@ -8,7 +8,7 @@
# @BLURB: This eclass provides Mozilla SCM building support
-inherit mozilla-scm-fetch
+inherit mozilla-scm-fetch python
# @ECLASS-VARIABLE: EHG_REVISION
# @DESCRIPTION:
@@ -26,3 +26,14 @@ DEPEND="${RDEPEND}
meta-sync/mozilla-repositories
"
+
+EXPORT_FUNCTIONS pkg_setup
+
+##
+## eclass exported function
+## pkg_setup
+##
+function mozilla-scm_pkg_setup {
+ mozilla-scm-fetch_pkg_setup
+ python_set_active_version 2
+}