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 23C2E138334 for ; Sat, 11 Aug 2018 08:14:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0DB6CE0815; Sat, 11 Aug 2018 08:14:49 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 D286BE0815 for ; Sat, 11 Aug 2018 08:14:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 24F07335C9F for ; Sat, 11 Aug 2018 08:14:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0C05B394 for ; Sat, 11 Aug 2018 08:14:44 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1533859225.9f66589863e10c074c8bf652d7f9ef7631e10d61.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/isolated-functions.sh X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 9f66589863e10c074c8bf652d7f9ef7631e10d61 X-VCS-Branch: master Date: Sat, 11 Aug 2018 08:14:44 +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-Archives-Salt: 104054b8-0c5c-4629-94e5-3184576fc307 X-Archives-Hash: 5412df64a76d4d5beae38e4a6a71b61c commit: 9f66589863e10c074c8bf652d7f9ef7631e10d61 Author: Zac Medico gentoo org> AuthorDate: Thu Aug 9 22:56:33 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Aug 10 00:00:25 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9f665898 XARGS: use gxargs for USERLAND=BSD (bug 663256) For USERLAND=BSD, set XARGS="gxargs -r" if gxargs is available, so the code from bug 630292 works for USERLAND=BSD. Fixes: 50283f1abb77 (install-qa-check.d/60pngfix: parallel support (bug 630292)) Bug: https://bugs.gentoo.org/663256 Reported-by: Michał Górny gentoo.org> Reviewed-by: M. J. Everitt iee.org> Reviewed-by: Brian Dolbec gentoo.org> bin/isolated-functions.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index 28ca94532..cac42a4c5 100644 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -448,7 +448,11 @@ fi if [[ -z ${XARGS} ]] ; then case ${USERLAND} in BSD) - export XARGS="xargs" + if type -P gxargs > /dev/null; then + export XARGS="gxargs -r" + else + export XARGS="xargs" + fi ;; *) export XARGS="xargs -r"