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 A54A71396DA for ; Sat, 14 Oct 2017 23:46:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E28272BC018; Sat, 14 Oct 2017 23:46:18 +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 BFC882BC018 for ; Sat, 14 Oct 2017 23:46:18 +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 63A7C33BF44 for ; Sat, 14 Oct 2017 23:46:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B4A88315 for ; Sat, 14 Oct 2017 23:46:15 +0000 (UTC) From: "Steve Arnold" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Steve Arnold" Message-ID: <1508020384.250707e426f3bd775d85671743df3053e6868c74.nerdboy@gentoo> Subject: [gentoo-commits] proj/crossdev:master commit in: / X-VCS-Repository: proj/crossdev X-VCS-Files: crossdev X-VCS-Directories: / X-VCS-Committer: nerdboy X-VCS-Committer-Name: Steve Arnold X-VCS-Revision: 250707e426f3bd775d85671743df3053e6868c74 X-VCS-Branch: master Date: Sat, 14 Oct 2017 23:46:15 +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: 4f8ad4d5-11c5-4903-9abd-f317354de46f X-Archives-Hash: e3e48bd3a99735699430b0a655dec36c commit: 250707e426f3bd775d85671743df3053e6868c74 Author: Steve Arnold gentoo org> AuthorDate: Sat Oct 14 22:33:04 2017 +0000 Commit: Steve Arnold gentoo org> CommitDate: Sat Oct 14 22:33:04 2017 +0000 URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=250707e4 Revert "ROOT method for glibc." This reverts commit d770cdb3feb397cedfdc36ac4b9f07f984152c86. crossdev | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/crossdev b/crossdev index 7fdb3e3..3f60517 100755 --- a/crossdev +++ b/crossdev @@ -1153,9 +1153,8 @@ emerge-wrapper --target ${CTARGET} --init || exit 1 ################# emerged_with_use() { - local pkg=$1 use=$2 alt - case $pkg in *lib*|musl) alt="/usr/${CTARGET}" ;; esac - grep -qs ${use} "${EPREFIX}"${alt}/var/db/pkg/cross-${CTARGET}/${pkg}-*/USE + local pkg=$1 use=$2 + grep -qs ${use} "${EPREFIX}"/var/db/pkg/cross-${CTARGET}/${pkg}-*/USE } set_eopts_on_pkg_status() { emerged_with_use "$@" \ @@ -1249,9 +1248,6 @@ if ! ex_fast ; then # care about at this point -- we aren't compiling yet USE="${LUSE} ${USE}" \ CROSSCOMPILE_OPTS="headers-only" \ - ROOT="${EPREFIX}"/usr/${CTARGET} \ - ALT_BUILD_HEADERS="${ROOT}"/usr/include \ - EPREFIX="/" \ EOPTS="${EOPTS} --nodeps" \ doemerge ${LPKG} ${LPKG}-headers fi @@ -1279,8 +1275,6 @@ if ! ex_fast ; then set_eopts_on_pkg_status ${LPKG} crosscompile_opts_headers-only USE="${LUSE} ${USE}" \ - ROOT=${EPREFIX}/usr/${CTARGET} \ - EPREFIX="/" \ CROSSCOMPILE_OPTS="" \ doemerge ${LPKG} fi