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 3AF521396D9 for ; Fri, 13 Oct 2017 16:31:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5CA9BE0BB3; Fri, 13 Oct 2017 16:31:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 38F3DE0B4B for ; Fri, 13 Oct 2017 16:31:45 +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 28B0A33BF51 for ; Fri, 13 Oct 2017 16:31:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8BED690A6 for ; Fri, 13 Oct 2017 16:31:42 +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: <1466945433.d770cdb3feb397cedfdc36ac4b9f07f984152c86.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: d770cdb3feb397cedfdc36ac4b9f07f984152c86 X-VCS-Branch: master Date: Fri, 13 Oct 2017 16:31:42 +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: 9a436fa6-8ea5-4c59-bb75-cb817c455803 X-Archives-Hash: 7f2ab0043ddb0c58af2ffc72a3132176 commit: d770cdb3feb397cedfdc36ac4b9f07f984152c86 Author: Benda Xu gentoo org> AuthorDate: Mon Jun 6 09:10:50 2016 +0000 Commit: Steve Arnold gentoo org> CommitDate: Sun Jun 26 12:50:33 2016 +0000 URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=d770cdb3 ROOT method for glibc. crossdev | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/crossdev b/crossdev index 6939c70..5bb4b77 100755 --- a/crossdev +++ b/crossdev @@ -1143,8 +1143,9 @@ emerge-wrapper --target ${CTARGET} --init || exit 1 ################# emerged_with_use() { - local pkg=$1 use=$2 - grep -qs ${use} "${EPREFIX}"/var/db/pkg/cross-${CTARGET}/${pkg}-*/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 } set_eopts_on_pkg_status() { emerged_with_use "$@" \ @@ -1238,6 +1239,9 @@ 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 @@ -1265,6 +1269,8 @@ 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