diff options
Diffstat (limited to 'eclass/meson.eclass')
| -rw-r--r-- | eclass/meson.eclass | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/eclass/meson.eclass b/eclass/meson.eclass index 3240fddf7e86..9d7f830e58b0 100644 --- a/eclass/meson.eclass +++ b/eclass/meson.eclass @@ -425,7 +425,7 @@ meson_src_configure() { export -n {C,CPP,CXX,F,OBJC,OBJCXX,LD}FLAGS PKG_CONFIG_{LIBDIR,PATH} echo meson setup "${MESONARGS[@]}" >&2 meson setup "${MESONARGS[@]}" - ) || die + ) || die -n } # @FUNCTION: meson_src_compile @@ -435,8 +435,9 @@ meson_src_configure() { meson_src_compile() { debug-print-function ${FUNCNAME} "$@" + pushd "${BUILD_DIR}" > /dev/null || die + local mesoncompileargs=( - -C "${BUILD_DIR}" --jobs "$(get_makeopts_jobs 0)" --load-average "$(get_makeopts_loadavg 0)" ) @@ -450,7 +451,9 @@ meson_src_compile() { set -- meson compile "${mesoncompileargs[@]}" echo "$@" >&2 - "$@" || die "compile failed" + "$@" || die -n "compile failed" + + popd > /dev/null || die } # @FUNCTION: meson_src_test @@ -460,16 +463,19 @@ meson_src_compile() { meson_src_test() { debug-print-function ${FUNCNAME} "$@" + pushd "${BUILD_DIR}" > /dev/null || die + local mesontestargs=( --print-errorlogs - -C "${BUILD_DIR}" --num-processes "$(makeopts_jobs "${MAKEOPTS}")" "$@" ) set -- meson test "${mesontestargs[@]}" echo "$@" >&2 - "$@" || die "tests failed" + "$@" || die -n "tests failed" + + popd > /dev/null || die } # @FUNCTION: meson_install @@ -479,8 +485,9 @@ meson_src_test() { meson_install() { debug-print-function ${FUNCNAME} "$@" + pushd "${BUILD_DIR}" > /dev/null || die + local mesoninstallargs=( - -C "${BUILD_DIR}" --destdir "${D}" --no-rebuild "$@" @@ -488,7 +495,9 @@ meson_install() { set -- meson install "${mesoninstallargs[@]}" echo "$@" >&2 - "$@" || die "install failed" + "$@" || die -n "install failed" + + popd > /dev/null || die } # @FUNCTION: meson_src_install |