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

[Sergei Trofimovich]

commit:     599c41fb4d25d18cd6571cb2a6c793906682c259
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 30 17:37:00 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Dec 30 17:37:00 2017 +0000
URL:        https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=599c41fb

crossdev: prepare for CROSSCOMPILE_OPTS=headers-only -> USE=headers-only 
transition

Crossdev will provide both
    CROSSCOMPILE_OPTS=headers-only USE=headers-only
to early toolchain bootstrap stage while ::gentoo
is not completely migrated off CROSSCOMPILE_OPTS=headers-only

The longer-term plan is to get rid of 'CROSSCOMPILE_OPTS=' completely.

Reported-by: Michał Górny
Bug: https://bugs.gentoo.org/642712
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 crossdev | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/crossdev b/crossdev
index d546dbe..fd9f598 100755
--- a/crossdev
+++ b/crossdev
@@ -1312,7 +1312,7 @@ if ! ex_fast ; then
                # first install headers if requested
                if with_headers ; then
                        # install kernel headers (since the C library often 
uses them)
-                       USE="${KUSE} ${USE}" \
+                       USE="${KUSE} ${USE} headers-only" \
                        CROSSCOMPILE_OPTS="headers-only" \
                                doemerge ${KPKG} ${KPKG}-quick
 
@@ -1321,7 +1321,7 @@ if ! ex_fast ; then
                                # we have to use --nodeps as glibc itself might 
have
                                # a dependency on newer gcc versions that we 
don't
                                # care about at this point -- we aren't 
compiling yet
-                               USE="${LUSE} ${USE}" \
+                               USE="${LUSE} ${USE} headers-only" \
                                CROSSCOMPILE_OPTS="headers-only" \
                                EOPTS="${EOPTS} --nodeps" \
                                        doemerge ${LPKG} ${LPKG}-headers
@@ -1336,7 +1336,7 @@ if ! ex_fast ; then
 
        # stage2: kernel headers
        if is_s2 ; then
-               set_eopts_on_pkg_status ${KPKG} crosscompile_opts_headers-only
+               set_eopts_on_pkg_status ${KPKG} crosscompile_opts_headers-only 
headers-only
 
                USE="${KUSE} ${USE}" \
                CROSSCOMPILE_OPTS="" \
@@ -1347,7 +1347,7 @@ if ! ex_fast ; then
        if is_s3 ; then
                [[ -z ${LPKG} ]] && die "Invalid target '${CTARGET}': unknown 
libc"
 
-               set_eopts_on_pkg_status ${LPKG} crosscompile_opts_headers-only
+               set_eopts_on_pkg_status ${LPKG} crosscompile_opts_headers-only 
headers-only
 
                USE="${LUSE} ${USE}" \
                CROSSCOMPILE_OPTS="" \