| 1 |
commit: 250707e426f3bd775d85671743df3053e6868c74 |
| 2 |
Author: Steve Arnold <nerdboy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 14 22:33:04 2017 +0000 |
| 4 |
Commit: Steve Arnold <nerdboy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 14 22:33:04 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=250707e4 |
| 7 |
|
| 8 |
Revert "ROOT method for glibc." |
| 9 |
|
| 10 |
This reverts commit d770cdb3feb397cedfdc36ac4b9f07f984152c86. |
| 11 |
|
| 12 |
crossdev | 10 ++-------- |
| 13 |
1 file changed, 2 insertions(+), 8 deletions(-) |
| 14 |
|
| 15 |
diff --git a/crossdev b/crossdev |
| 16 |
index 7fdb3e3..3f60517 100755 |
| 17 |
--- a/crossdev |
| 18 |
+++ b/crossdev |
| 19 |
@@ -1153,9 +1153,8 @@ emerge-wrapper --target ${CTARGET} --init || exit 1 |
| 20 |
|
| 21 |
################# |
| 22 |
emerged_with_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 |
+ local pkg=$1 use=$2 |
| 27 |
+ grep -qs ${use} "${EPREFIX}"/var/db/pkg/cross-${CTARGET}/${pkg}-*/USE |
| 28 |
} |
| 29 |
set_eopts_on_pkg_status() { |
| 30 |
emerged_with_use "$@" \ |
| 31 |
@@ -1249,9 +1248,6 @@ if ! ex_fast ; then |
| 32 |
# care about at this point -- we aren't compiling yet |
| 33 |
USE="${LUSE} ${USE}" \ |
| 34 |
CROSSCOMPILE_OPTS="headers-only" \ |
| 35 |
- ROOT="${EPREFIX}"/usr/${CTARGET} \ |
| 36 |
- ALT_BUILD_HEADERS="${ROOT}"/usr/include \ |
| 37 |
- EPREFIX="/" \ |
| 38 |
EOPTS="${EOPTS} --nodeps" \ |
| 39 |
doemerge ${LPKG} ${LPKG}-headers |
| 40 |
fi |
| 41 |
@@ -1279,8 +1275,6 @@ if ! ex_fast ; then |
| 42 |
set_eopts_on_pkg_status ${LPKG} crosscompile_opts_headers-only |
| 43 |
|
| 44 |
USE="${LUSE} ${USE}" \ |
| 45 |
- ROOT=${EPREFIX}/usr/${CTARGET} \ |
| 46 |
- EPREFIX="/" \ |
| 47 |
CROSSCOMPILE_OPTS="" \ |
| 48 |
doemerge ${LPKG} |
| 49 |
fi |
Archives