summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-tv')
-rw-r--r--media-tv/kodi/kodi-15.1.ebuild6
-rw-r--r--media-tv/kodi/kodi-9999.ebuild6
2 files changed, 8 insertions, 4 deletions
diff --git a/media-tv/kodi/kodi-15.1.ebuild b/media-tv/kodi/kodi-15.1.ebuild
index f8a9d2a12f5f..912c5e5822e2 100644
--- a/media-tv/kodi/kodi-15.1.ebuild
+++ b/media-tv/kodi/kodi-15.1.ebuild
@@ -9,7 +9,7 @@ EAPI="5"
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="sqlite"
-inherit eutils linux-info python-single-r1 multiprocessing autotools
+inherit eutils linux-info python-single-r1 multiprocessing autotools toolchain-funcs
CODENAME="Isengard"
case ${PV} in
@@ -172,7 +172,9 @@ src_prepare() {
multijob_finish
elibtoolize
- [[ ${PV} == "9999" ]] && emake -f codegenerator.mk
+ if [[ ${PV} == "9999" ]] || use java ; then #558798
+ tc-env_build emake -f codegenerator.mk
+ fi
# Disable internal func checks as our USE/DEPEND
# stuff handles this just fine already #408395
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 5c7905dec143..165dacba6b06 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -9,7 +9,7 @@ EAPI="5"
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="sqlite"
-inherit eutils linux-info python-single-r1 multiprocessing autotools
+inherit eutils linux-info python-single-r1 multiprocessing autotools toolchain-funcs
CODENAME="Isengard"
case ${PV} in
@@ -172,7 +172,9 @@ src_prepare() {
multijob_finish
elibtoolize
- [[ ${PV} == "9999" ]] && emake -f codegenerator.mk
+ if [[ ${PV} == "9999" ]] || use java ; then #558798
+ tc-env_build emake -f codegenerator.mk
+ fi
# Disable internal func checks as our USE/DEPEND
# stuff handles this just fine already #408395