From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0C0171382C5 for ; Sat, 2 Jan 2021 10:48:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 326B8E0837; Sat, 2 Jan 2021 10:48:12 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 05E85E0837 for ; Sat, 2 Jan 2021 10:48:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C62C2340D48 for ; Sat, 2 Jan 2021 10:48:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 51093C3 for ; Sat, 2 Jan 2021 10:48:09 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1609583781.84ecb26582afcba8f260ae2d00c3235810ced7b7.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: scripts/bootstrap-prefix.sh X-VCS-Directories: scripts/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 84ecb26582afcba8f260ae2d00c3235810ced7b7 X-VCS-Branch: master Date: Sat, 2 Jan 2021 10:48:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6240a2bc-c980-49bb-9460-12370257272b X-Archives-Hash: 8d72e45e3ab5e70dd22f28caf3c03ff5 commit: 84ecb26582afcba8f260ae2d00c3235810ced7b7 Author: Fabian Groffen gentoo org> AuthorDate: Sat Jan 2 10:36:21 2021 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sat Jan 2 10:36:21 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=84ecb265 scripts/bootstrap-prefix: use emake wrapper for unified behaviour emake uses v() to log what it does (consistently) and applies $MAKEOPTS Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 8d1260c558..b9f225be71 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -31,6 +31,10 @@ econf() { "$@" || return 1 } +emake() { + v $MAKE ${MAKEOPTS} "$@" || return 1 +} + efetch() { if [[ ! -e ${DISTDIR}/${1##*/} ]] ; then if [[ ${OFFLINE_MODE} ]]; then @@ -680,10 +684,10 @@ bootstrap_portage() { --with-portage-group="`id -gn`" \ --with-extra-path="${PATH}" \ || return 1 - $MAKE ${MAKEOPTS} || return 1 + emake || return 1 einfo "Installing ${A%-*}" - $MAKE install || return 1 + emake install || return 1 cd "${ROOT}" rm -Rf ${ptmp} >& /dev/null @@ -759,10 +763,10 @@ bootstrap_simple() { if [[ -x configure ]] ; then econf ${myconf} || return 1 fi - v $MAKE || return 1 + emake || return 1 einfo "Installing ${A%-*}" - v $MAKE PREFIX="${ROOT}"/tmp/usr install || return 1 + emake PREFIX="${ROOT}"/tmp/usr install || return 1 cd "${ROOT}" rm -Rf "${S}" @@ -963,14 +967,14 @@ bootstrap_gnu() { if [[ ${PN} == "make" && $(type -t $MAKE) != "file" ]]; then v ./build.sh || return 1 else - v $MAKE ${MAKEOPTS} || return 1 + emake || return 1 fi einfo "Installing ${PN}" if [[ ${PN} == "make" && $(type -t $MAKE) != "file" ]]; then v ./make install MAKE="${S}/make" || return 1 else - v $MAKE install || return 1 + emake install || return 1 fi cd "${ROOT}" @@ -1137,10 +1141,10 @@ bootstrap_python() { --disable-shared \ --libdir="${ROOT}"/tmp/usr/lib \ ${myconf} || return 1 - $MAKE ${MAKEOPTS} || return 1 + emake || return 1 einfo "Installing ${A%-*}" - $MAKE -k install || echo "??? Python failed to install *sigh* continuing anyway" + emake -k install || echo "??? Python failed to install *sigh* continuing anyway" cd "${ROOT}"/tmp/usr/bin ln -sf python${PV%.*} python cd "${ROOT}"/tmp/usr/lib @@ -1180,10 +1184,10 @@ bootstrap_cmake() { ./bootstrap --prefix="${ROOT}"/tmp/usr || return 1 einfo "Compiling ${A%-*}" - $MAKE ${MAKEOPTS} || return 1 + emake || return 1 einfo "Installing ${A%-*}" - $MAKE ${MAKEOPTS} install || return 1 + emake install || return 1 # we need sysroot crap to build cmake itself, but it makes trouble # lateron, so kill it in the installed version @@ -1256,10 +1260,11 @@ bootstrap_zlib_core() { einfo "Compiling ${A%-*}" CHOST= ${CONFIG_SHELL} ./configure --prefix="${ROOT}"/tmp/usr || return 1 - $MAKE "${makeopts[@]}" || return 1 + MAKEOPTS= + emake "${makeopts[@]}" || return 1 einfo "Installing ${A%-*}" - $MAKE "${makeopts[@]}" -j1 install || return 1 + emake "${makeopts[@]}" -j1 install || return 1 # this lib causes issues when emerging python again on Solaris # because the tmp lib path is in the library search path there