| 1 |
commit: d770cdb3feb397cedfdc36ac4b9f07f984152c86 |
| 2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jun 6 09:10:50 2016 +0000 |
| 4 |
Commit: Steve Arnold <nerdboy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 26 12:50:33 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=d770cdb3 |
| 7 |
|
| 8 |
ROOT method for glibc. |
| 9 |
|
| 10 |
crossdev | 10 ++++++++-- |
| 11 |
1 file changed, 8 insertions(+), 2 deletions(-) |
| 12 |
|
| 13 |
diff --git a/crossdev b/crossdev |
| 14 |
index 6939c70..5bb4b77 100755 |
| 15 |
--- a/crossdev |
| 16 |
+++ b/crossdev |
| 17 |
@@ -1143,8 +1143,9 @@ emerge-wrapper --target ${CTARGET} --init || exit 1 |
| 18 |
|
| 19 |
################# |
| 20 |
emerged_with_use() { |
| 21 |
- local pkg=$1 use=$2 |
| 22 |
- grep -qs ${use} "${EPREFIX}"/var/db/pkg/cross-${CTARGET}/${pkg}-*/USE |
| 23 |
+ local pkg=$1 use=$2 alt |
| 24 |
+ case $pkg in *lib*|musl) alt="/usr/${CTARGET}" ;; esac |
| 25 |
+ grep -qs ${use} "${EPREFIX}"${alt}/var/db/pkg/cross-${CTARGET}/${pkg}-*/USE |
| 26 |
} |
| 27 |
set_eopts_on_pkg_status() { |
| 28 |
emerged_with_use "$@" \ |
| 29 |
@@ -1238,6 +1239,9 @@ if ! ex_fast ; then |
| 30 |
# care about at this point -- we aren't compiling yet |
| 31 |
USE="${LUSE} ${USE}" \ |
| 32 |
CROSSCOMPILE_OPTS="headers-only" \ |
| 33 |
+ ROOT="${EPREFIX}"/usr/${CTARGET} \ |
| 34 |
+ ALT_BUILD_HEADERS="${ROOT}"/usr/include \ |
| 35 |
+ EPREFIX="/" \ |
| 36 |
EOPTS="${EOPTS} --nodeps" \ |
| 37 |
doemerge ${LPKG} ${LPKG}-headers |
| 38 |
fi |
| 39 |
@@ -1265,6 +1269,8 @@ if ! ex_fast ; then |
| 40 |
set_eopts_on_pkg_status ${LPKG} crosscompile_opts_headers-only |
| 41 |
|
| 42 |
USE="${LUSE} ${USE}" \ |
| 43 |
+ ROOT=${EPREFIX}/usr/${CTARGET} \ |
| 44 |
+ EPREFIX="/" \ |
| 45 |
CROSSCOMPILE_OPTS="" \ |
| 46 |
doemerge ${LPKG} |
| 47 |
fi |
Archives