diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 38145 -> 38153 bytes | |||
| -rw-r--r-- | eclass/cmake.eclass | 4 | ||||
| -rw-r--r-- | eclass/git-r3.eclass | 4 | ||||
| -rw-r--r-- | eclass/meson.eclass | 18 | ||||
| -rw-r--r-- | eclass/ninja-utils.eclass | 16 |
5 files changed, 33 insertions, 9 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 059fea11c41e..8e123b6d2ef8 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass index d70f2cbf1fac..16b3e300ccae 100644 --- a/eclass/cmake.eclass +++ b/eclass/cmake.eclass @@ -651,6 +651,10 @@ cmake_build() { ;; ninja) [[ -e build.ninja ]] || die "build.ninja not found. Error during configure stage." + case ${CMAKE_VERBOSE} in + OFF) NINJA_VERBOSE=OFF eninja "$@" ;; + *) eninja "$@" ;; + esac eninja "$@" ;; esac diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass index e9fdf2ac3a42..5ac141962b12 100644 --- a/eclass/git-r3.eclass +++ b/eclass/git-r3.eclass @@ -344,7 +344,7 @@ _git-r3_set_gitdir() { umask "${EVCS_UMASK}" || die "Bad options to umask: ${EVCS_UMASK}" fi mkdir "${GIT_DIR}" || die - git init --bare || die + git init --bare -b __init__ || die if [[ ${saved_umask} ]]; then umask "${saved_umask}" || die fi @@ -874,7 +874,7 @@ git-r3_checkout() { # use git init+fetch instead of clone since the latter doesn't like # non-empty directories. - git init --quiet || die + git init --quiet -b __init__ || die # setup 'alternates' to avoid copying objects echo "${orig_repo}/objects" > "${GIT_DIR}"/objects/info/alternates || die # now copy the refs diff --git a/eclass/meson.eclass b/eclass/meson.eclass index 2c274b213191..5aff3eb58930 100644 --- a/eclass/meson.eclass +++ b/eclass/meson.eclass @@ -3,8 +3,7 @@ # @ECLASS: meson.eclass # @MAINTAINER: -# William Hubbs <williamh@gentoo.org> -# Mike Gilbert <floppym@gentoo.org> +# base-system@gentoo.org # @SUPPORTED_EAPIS: 7 8 # @BLURB: common ebuild functions for meson-based packages # @DESCRIPTION: @@ -55,6 +54,12 @@ BDEPEND=">=dev-util/meson-0.62.2 # Build directory, location where all generated files should be placed. # If this isn't set, it defaults to ${WORKDIR}/${P}-build. +# @ECLASS_VARIABLE: MESON_VERBOSE +# @USER_VARIABLE +# @DESCRIPTION: +# Set to OFF to disable verbose messages during compilation +: "${MESON_VERBOSE:=ON}" + # @ECLASS_VARIABLE: EMESON_BUILDTYPE # @DESCRIPTION: # The buildtype value to pass to meson setup. @@ -385,10 +390,15 @@ meson_src_compile() { -C "${BUILD_DIR}" --jobs "$(makeopts_jobs "${MAKEOPTS}" 0)" --load-average "$(makeopts_loadavg "${MAKEOPTS}" 0)" - --verbose - "$@" ) + case ${MESON_VERBOSE} in + OFF) ;; + *) mesoncompileargs+=( --verbose ) ;; + esac + + mesoncompileargs+=( "$@" ) + set -- meson compile "${mesoncompileargs[@]}" echo "$@" >&2 "$@" || die "compile failed" diff --git a/eclass/ninja-utils.eclass b/eclass/ninja-utils.eclass index e6d8c9e6c0a9..5a211e81131d 100644 --- a/eclass/ninja-utils.eclass +++ b/eclass/ninja-utils.eclass @@ -3,8 +3,7 @@ # @ECLASS: ninja-utils.eclass # @MAINTAINER: -# Michał Górny <mgorny@gentoo.org> -# Mike Gilbert <floppym@gentoo.org> +# base-system@gentoo.org # @AUTHOR: # Michał Górny <mgorny@gentoo.org> # Mike Gilbert <floppym@gentoo.org> @@ -48,6 +47,12 @@ _NINJA_UTILS_ECLASS=1 # supposed to be set in make.conf. If unset, eninja() will convert # MAKEOPTS instead. +# @ECLASS_VARIABLE: NINJA_VERBOSE +# @USER_VARIABLE +# @DESCRIPTION: +# Set to OFF to disable verbose messages during compilation +: "${NINJA_VERBOSE:=ON}" + inherit multiprocessing case "${NINJA}" in @@ -80,7 +85,12 @@ get_NINJAOPTS() { # also supports being called via 'nonfatal'. eninja() { [[ -n "${NINJA_DEPEND}" ]] || ewarn "Unknown value '${NINJA}' for \${NINJA}" - set -- "${NINJA}" -v $(get_NINJAOPTS) "$@" + local v + case "${NINJA_VERBOSE}" in + OFF) ;; + *) v="-v" + esac + set -- "${NINJA}" ${v} $(get_NINJAOPTS) "$@" echo "$@" >&2 "$@" || die -n "${*} failed" } |