diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-09-13 02:41:14 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-12-10 22:54:11 +0100 |
| commit | 3744ebf110305eca69d78770208b9e879cf36248 (patch) | |
| tree | 7ce1ad4926591e06f0d7e2baf18e319314cb2659 | |
| parent | cmake-utils.eclass: Enable BUILD_SHARED_LIBS by default in EAPI >= 7 (diff) | |
| download | gentoo-3744ebf110305eca69d78770208b9e879cf36248.tar.gz gentoo-3744ebf110305eca69d78770208b9e879cf36248.tar.bz2 gentoo-3744ebf110305eca69d78770208b9e879cf36248.zip | |
cmake-utils.eclass: Turn `eqawarn` into `die` for >= EAPI 7
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | eclass/cmake-utils.eclass | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 43397aad8c28..776de76b31d4 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -125,7 +125,13 @@ esac EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install -[[ ${WANT_CMAKE} ]] && eqawarn "\${WANT_CMAKE} has been removed and is a no-op now" +if [[ ${WANT_CMAKE} ]]; then + if [[ ${EAPI} != [56] ]]; then + die "\${WANT_CMAKE} has been removed and is a no-op now" + else + eqawarn "\${WANT_CMAKE} has been removed and is a no-op now" + fi +fi [[ ${PREFIX} ]] && die "\${PREFIX} has been removed and is a no-op now" case ${CMAKE_MAKEFILE_GENERATOR} in @@ -208,8 +214,13 @@ _cmake_check_build_dir() { # Respect both the old variable and the new one, depending # on which one was set by the ebuild. if [[ ! ${BUILD_DIR} && ${CMAKE_BUILD_DIR} ]]; then - eqawarn "The CMAKE_BUILD_DIR variable has been renamed to BUILD_DIR." - eqawarn "Please migrate the ebuild to use the new one." + if [[ ${EAPI} != [56] ]]; then + eerror "The CMAKE_BUILD_DIR variable has been renamed to BUILD_DIR." + die "The ebuild must be migrated to BUILD_DIR." + else + eqawarn "The CMAKE_BUILD_DIR variable has been renamed to BUILD_DIR." + eqawarn "Please migrate the ebuild to use the new one." + fi # In the next call, both variables will be set already # and we'd have to know which one takes precedence. @@ -224,7 +235,7 @@ _cmake_check_build_dir() { fi # Backwards compatibility for getting the value. - CMAKE_BUILD_DIR=${BUILD_DIR} + [[ ${EAPI} == [56] ]] && CMAKE_BUILD_DIR=${BUILD_DIR} mkdir -p "${BUILD_DIR}" || die echo ">>> Working in BUILD_DIR: \"$BUILD_DIR\"" @@ -508,7 +519,11 @@ cmake-utils_src_configure() { debug-print-function ${FUNCNAME} "$@" if [[ ! ${_CMAKE_UTILS_SRC_PREPARE_HAS_RUN} ]]; then - eqawarn "cmake-utils_src_prepare has not been run, please open a bug on https://bugs.gentoo.org/" + if [[ ${EAPI} != [56] ]]; then + die "FATAL: cmake-utils_src_prepare has not been run" + else + eqawarn "cmake-utils_src_prepare has not been run, please open a bug on https://bugs.gentoo.org/" + fi fi [[ ${EAPI} == 5 ]] && _cmake_cleanup_cmake |