From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6C655138454 for ; Thu, 10 Sep 2015 19:39:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E156C21C010; Thu, 10 Sep 2015 19:39:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7A23421C010 for ; Thu, 10 Sep 2015 19:39:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 51B693408FF for ; Thu, 10 Sep 2015 19:39:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 97752170 for ; Thu, 10 Sep 2015 19:39:30 +0000 (UTC) From: "Richard Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Farina" Message-ID: <1441913977.934849080c2ec3996835c756421f5e22c693c736.zerochaos@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/chroot-functions.sh X-VCS-Directories: targets/support/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Richard Farina X-VCS-Revision: 934849080c2ec3996835c756421f5e22c693c736 X-VCS-Branch: master Date: Thu, 10 Sep 2015 19:39:30 +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: cd697c48-8507-4a44-9ff8-988109eedee1 X-Archives-Hash: c518ea8fe62c0e80aa02cfa68f08f313 commit: 934849080c2ec3996835c756421f5e22c693c736 Author: Rick Farina (Zero_Chaos) gentoo org> AuthorDate: Thu Sep 10 19:39:37 2015 +0000 Commit: Richard Farina gentoo org> CommitDate: Thu Sep 10 19:39:37 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=93484908 workaround bug #560166 by setting USE more properly targets/support/chroot-functions.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index 91a2b5f..68622f2 100755 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -167,8 +167,15 @@ setup_gcc(){ setup_pkgmgr(){ # Set bindist USE flag if clst_BINDIST is set - [ "${clst_target}" != "stage1" ] && [ -e "${clst_make_conf}" ] \ - && [ -n "${clst_BINDIST}" ] && echo "USE=\"\${USE} bindist\"" >> "${clst_make_conf}" + if [ "${clst_target}" != "stage1" ] && [ -e "${clst_make_conf}" ] \ + && [ -n "${clst_BINDIST}" ]; then + if grep -q ^USE "${clst_make_conf}"; then + echo "USE=\"\${USE} bindist\"" >> "${clst_make_conf}" + else + echo "USE=\"bindist\"" >> "${clst_make_conf}" + fi + + fi # We need to merge our package manager with USE="build" set in case it is # portage to avoid frying our /etc/portage/make.conf file. Otherwise, we could @@ -234,6 +241,7 @@ cleanup_stages() { # Remove bindist from use sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}" + sed -i "/USE=\"bindist\"/d" "${clst_make_conf}" [ "${clst_target}" != "tinderbox" ] && rm -f /var/log/emerge.log /var/log/portage/elog/* }