From 3931b905b44d3728eebfba8097ef6030fc1beac3 Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Fri, 8 Apr 2022 18:21:55 +0500 Subject: [PATCH] boinc.eclass: fix inherit guard usage Signed-off-by: Anna (cybertailor) Vyalkova --- eclass/boinc.eclass | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/eclass/boinc.eclass b/eclass/boinc.eclass index f2c28b6283..cf5cd8515f 100644 --- a/eclass/boinc.eclass +++ b/eclass/boinc.eclass @@ -9,14 +9,12 @@ # @DESCRIPTION: # This eclass provides helper functions to build BOINC applications and libraries. -inherit autotools toolchain-funcs - case ${EAPI} in 8) ;; *) die "${ECLASS}: EAPI ${EAPI} unsupported." esac -# @ECLASS-VARIABLE: BOINC_SUBMODULE +# @ECLASS_VARIABLE: BOINC_SUBMODULE # @PRE_INHERIT # @DEFAULT_UNSET # @DESCRIPTION: @@ -26,7 +24,7 @@ esac # # If unset, no functions will be exported. -# @ECLASS-VARIABLE: BOINC_S +# @ECLASS_VARIABLE: BOINC_S # @DEFAULT_UNSET # @DESCRIPTION: # If defined this variable determines the source directory name after @@ -34,6 +32,12 @@ esac # variable supports a wildcard mechanism to help with github tarballs # that contain the commit hash as part of the directory name. +if [[ ! ${_BOINC_ECLASS} ]]; then + +inherit autotools toolchain-funcs + +fi + if [[ ${BOINC_SUBMODULE} ]]; then EXPORT_FUNCTIONS src_unpack src_prepare src_configure fi @@ -72,7 +76,7 @@ get_boinc_src() { } -# @ECLASS-VARIABLE: BOINC_BUILD_DIR +# @ECLASS_VARIABLE: BOINC_BUILD_DIR # @OUTPUT_VARIABLE # @DESCRIPTION: # Temporary build directory, where BOINC sources are located.