[gentoo-commits] proj/crossdev:master commit in: /

[Steve Arnold]

commit:     d770cdb3feb397cedfdc36ac4b9f07f984152c86
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  6 09:10:50 2016 +0000
Commit:     Steve Arnold <nerdboy <AT> gentoo <DOT> 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