From 959575d1af06bc64016d62d064143faba68a4c43 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 25 Nov 2022 13:12:41 +0000 Subject: gentoo auto-resync : 25:11:2022 - 13:12:41 --- eclass/Manifest.gz | Bin 37519 -> 37507 bytes eclass/mozcoreconf-v5.eclass | 1 + eclass/waf-utils.eclass | 14 ++++++++++++-- 3 files changed, 13 insertions(+), 2 deletions(-) (limited to 'eclass') diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz index 5d8aae36574d..ab5d90ac2f29 100644 Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ diff --git a/eclass/mozcoreconf-v5.eclass b/eclass/mozcoreconf-v5.eclass index 8da12ab0f939..72d87829a938 100644 --- a/eclass/mozcoreconf-v5.eclass +++ b/eclass/mozcoreconf-v5.eclass @@ -1,6 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # +# @DEAD # @ECLASS: mozcoreconf-v5.eclass # @MAINTAINER: # Mozilla team diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass index cfcefed52274..3ff74db0d796 100644 --- a/eclass/waf-utils.eclass +++ b/eclass/waf-utils.eclass @@ -88,17 +88,23 @@ waf-utils_src_configure() { if [[ ${waf_help} == *--libdir* ]]; then conf_args+=( --libdir="${EPREFIX}/usr/$(get_libdir)" ) fi + if [[ ${waf_help} == *--mandir* ]]; then + conf_args+=( --mandir="${EPREFIX}"/usr/share/man ) + fi tc-export AR CC CPP CXX RANLIB local CMD=( + PYTHONHASHSEED=1 CCFLAGS="${CFLAGS}" LINKFLAGS="${CFLAGS} ${LDFLAGS}" PKGCONFIG="$(tc-getPKG_CONFIG)" "${WAF_BINARY}" + "--jobs=1" "--prefix=${EPREFIX}/usr" "${conf_args[@]}" "${@}" + ${EXTRA_ECONF} configure ) @@ -114,6 +120,8 @@ waf-utils_src_compile() { local _mywafconfig [[ ${WAF_VERBOSE} == ON ]] && _mywafconfig="--verbose" + export PYTHONHASHSEED=1 + local jobs="--jobs=$(makeopts_jobs)" echo "\"${WAF_BINARY}\" build ${_mywafconfig} ${jobs} ${*}" "${WAF_BINARY}" ${_mywafconfig} ${jobs} "${@}" || die "build failed" @@ -125,8 +133,10 @@ waf-utils_src_compile() { waf-utils_src_install() { debug-print-function ${FUNCNAME} "$@" - echo "\"${WAF_BINARY}\" --destdir=\"${D}\" ${*} install" - "${WAF_BINARY}" --destdir="${D}" "${@}" install || die "Make install failed" + export PYTHONHASHSEED=1 + + echo "\"${WAF_BINARY}\" --jobs=1 --destdir=\"${D}\" ${*} install" + "${WAF_BINARY}" --jobs=1 --destdir="${D}" "${@}" install || die "Make install failed" # Manual document installation einstalldocs -- cgit v1.2.3