diff options
| author | Michał Górny <mgorny@gentoo.org> | 2015-11-22 09:39:59 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2015-11-22 09:41:51 +0100 |
| commit | 80f37effc3a6bacfba4d999fbf6919b42168c2eb (patch) | |
| tree | 136cf8abd322003d6e01ce6a2dfcaaf923eba7eb /eclass/games.eclass | |
| parent | 31cb5e2c02c81c16cd40671c54037dbde824a8cc (diff) | |
| download | gentoo-80f37effc3a6bacfba4d999fbf6919b42168c2eb.tar.gz gentoo-80f37effc3a6bacfba4d999fbf6919b42168c2eb.tar.xz | |
[QA] games.eclass: Revert "Stop inheriting base.eclass (bug #494208)"
Revert retroactive inherit (and therefore exported functions) change due
to potential breakage.
Discussion: https://archives.gentoo.org/gentoo-dev/message/37094a3177e6a938254173595775521a
Diffstat (limited to 'eclass/games.eclass')
| -rw-r--r-- | eclass/games.eclass | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/eclass/games.eclass b/eclass/games.eclass index aebf679b642..7d231e186cc 100644 --- a/eclass/games.eclass +++ b/eclass/games.eclass @@ -24,11 +24,11 @@ if [[ -z ${_GAMES_ECLASS} ]]; then _GAMES_ECLASS=1 -inherit multilib toolchain-funcs eutils user +inherit base multilib toolchain-funcs eutils user case ${EAPI:-0} in 0|1) EXPORT_FUNCTIONS pkg_setup src_compile pkg_preinst pkg_postinst ;; - 2|3|4|5|6) EXPORT_FUNCTIONS pkg_setup src_configure src_compile pkg_preinst pkg_postinst ;; + 2|3|4|5) EXPORT_FUNCTIONS pkg_setup src_configure src_compile pkg_preinst pkg_postinst ;; *) die "no support for EAPI=${EAPI} yet" ;; esac @@ -302,14 +302,12 @@ games_src_configure() { # @FUNCTION: games_src_compile # @DESCRIPTION: -# This function is exported as src_compile(). +# Runs base_src_make(). This function is exported as src_compile(). games_src_compile() { case ${EAPI:-0} in 0|1) games_src_configure ;; esac - if [[ -f Makefile || -f GNUmakefile || -f makefile ]]; then - emake "$@" || die - fi + base_src_make } # @FUNCTION: games_pkg_preinst |