1 |
commit: 599c41fb4d25d18cd6571cb2a6c793906682c259 |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 30 17:37:00 2017 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 30 17:37:00 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=599c41fb |
7 |
|
8 |
crossdev: prepare for CROSSCOMPILE_OPTS=headers-only -> USE=headers-only transition |
9 |
|
10 |
Crossdev will provide both |
11 |
CROSSCOMPILE_OPTS=headers-only USE=headers-only |
12 |
to early toolchain bootstrap stage while ::gentoo |
13 |
is not completely migrated off CROSSCOMPILE_OPTS=headers-only |
14 |
|
15 |
The longer-term plan is to get rid of 'CROSSCOMPILE_OPTS=' completely. |
16 |
|
17 |
Reported-by: Michał Górny |
18 |
Bug: https://bugs.gentoo.org/642712 |
19 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
20 |
|
21 |
crossdev | 8 ++++---- |
22 |
1 file changed, 4 insertions(+), 4 deletions(-) |
23 |
|
24 |
diff --git a/crossdev b/crossdev |
25 |
index d546dbe..fd9f598 100755 |
26 |
--- a/crossdev |
27 |
+++ b/crossdev |
28 |
@@ -1312,7 +1312,7 @@ if ! ex_fast ; then |
29 |
# first install headers if requested |
30 |
if with_headers ; then |
31 |
# install kernel headers (since the C library often uses them) |
32 |
- USE="${KUSE} ${USE}" \ |
33 |
+ USE="${KUSE} ${USE} headers-only" \ |
34 |
CROSSCOMPILE_OPTS="headers-only" \ |
35 |
doemerge ${KPKG} ${KPKG}-quick |
36 |
|
37 |
@@ -1321,7 +1321,7 @@ if ! ex_fast ; then |
38 |
# we have to use --nodeps as glibc itself might have |
39 |
# a dependency on newer gcc versions that we don't |
40 |
# care about at this point -- we aren't compiling yet |
41 |
- USE="${LUSE} ${USE}" \ |
42 |
+ USE="${LUSE} ${USE} headers-only" \ |
43 |
CROSSCOMPILE_OPTS="headers-only" \ |
44 |
EOPTS="${EOPTS} --nodeps" \ |
45 |
doemerge ${LPKG} ${LPKG}-headers |
46 |
@@ -1336,7 +1336,7 @@ if ! ex_fast ; then |
47 |
|
48 |
# stage2: kernel headers |
49 |
if is_s2 ; then |
50 |
- set_eopts_on_pkg_status ${KPKG} crosscompile_opts_headers-only |
51 |
+ set_eopts_on_pkg_status ${KPKG} crosscompile_opts_headers-only headers-only |
52 |
|
53 |
USE="${KUSE} ${USE}" \ |
54 |
CROSSCOMPILE_OPTS="" \ |
55 |
@@ -1347,7 +1347,7 @@ if ! ex_fast ; then |
56 |
if is_s3 ; then |
57 |
[[ -z ${LPKG} ]] && die "Invalid target '${CTARGET}': unknown libc" |
58 |
|
59 |
- set_eopts_on_pkg_status ${LPKG} crosscompile_opts_headers-only |
60 |
+ set_eopts_on_pkg_status ${LPKG} crosscompile_opts_headers-only headers-only |
61 |
|
62 |
USE="${LUSE} ${USE}" \ |
63 |
CROSSCOMPILE_OPTS="" \ |