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 E2DCD138334 for ; Sat, 8 Jun 2019 22:25:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C443BE07D7; Sat, 8 Jun 2019 22:25:09 +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 94D7FE07D7 for ; Sat, 8 Jun 2019 22:25:09 +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 EF022345A4F for ; Sat, 8 Jun 2019 22:25:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 043C055B for ; Sat, 8 Jun 2019 22:25:06 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1560032676.7d211604cc83b15d4aed3dc0f04edc6c3201c86f.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/ncurses/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/ncurses/ncurses-6.1_p20181020.ebuild X-VCS-Directories: sys-libs/ncurses/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 7d211604cc83b15d4aed3dc0f04edc6c3201c86f X-VCS-Branch: master Date: Sat, 8 Jun 2019 22:25:06 +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: 67826b59-13c3-4b0a-b8fc-a5f4e53cebcf X-Archives-Hash: 35d01eebb5c479f7d09d837d442acb6f commit: 7d211604cc83b15d4aed3dc0f04edc6c3201c86f Author: James Le Cuirot gentoo org> AuthorDate: Sat Jun 8 22:24:36 2019 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Sat Jun 8 22:24:36 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d211604 sys-libs/ncurses: Fix broken use of ROOT=/ has_version under EAPI 7 Pass -b instead as changing ROOT confuses Portage to the point where this breaks when building for a ROOTed cross-prefix environment. Package-Manager: Portage-2.3.67, Repoman-2.3.13 Signed-off-by: James Le Cuirot gentoo.org> sys-libs/ncurses/ncurses-6.1_p20181020.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild b/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild index c96c376e5c8..ba84afddf04 100644 --- a/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild +++ b/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild @@ -70,7 +70,7 @@ src_configure() { # This comes up when cross-compiling, doing multilib builds, upgrading, # or installing for the first time. Build a local copy of tic whenever # the host version isn't available. #249363 #557598 - if ! ROOT=/ has_version "~sys-libs/${P}:0" ; then + if ! has_version -b "~sys-libs/${P}:0" ; then local lbuildflags="-static" # some toolchains don't quite support static linking @@ -192,7 +192,7 @@ do_configure() { src_compile() { # See comments in src_configure. - if ! ROOT=/ has_version "~sys-libs/${P}:0" ; then + if ! has_version -b "~sys-libs/${P}:0" ; then BUILD_DIR="${WORKDIR}" \ do_compile cross -C progs tic fi