Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/devmanual:master commit in: general-concepts/user-environment/, general-concepts/use-flags/, ...
Date: Mon, 26 Oct 2020 15:42:08
Message-Id: 1601147281.806edccfa0d217db4e01f9f510a71daf22c663c7.ulm@gentoo
1 commit: 806edccfa0d217db4e01f9f510a71daf22c663c7
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 26 19:08:01 2020 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 26 19:08:01 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=806edccf
7
8 Link to make.conf man page where it is referenced.
9
10 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
11
12 general-concepts/use-flags/text.xml | 9 +++++----
13 general-concepts/user-environment/text.xml | 14 ++++++++------
14 profiles/make.defaults/text.xml | 11 ++++++-----
15 3 files changed, 19 insertions(+), 15 deletions(-)
16
17 diff --git a/general-concepts/use-flags/text.xml b/general-concepts/use-flags/text.xml
18 index c591aaa..321a509 100644
19 --- a/general-concepts/use-flags/text.xml
20 +++ b/general-concepts/use-flags/text.xml
21 @@ -206,8 +206,9 @@ it on or off by default.
22 <important>
23 Adding <c>-</c> before a flag in <c>IUSE</c> is pretty much useless, as it will
24 neither override the user configuration (<c>make.conf</c>) nor the profile
25 -default (<c>make.defaults</c> and <c>package.use</c>). See make.conf(5) for
26 -details on USE-ordering in Portage.
27 +default (<c>make.defaults</c> and <c>package.use</c>).
28 +See <uri link="::eclass-reference/make.conf/">make.conf(5)</uri> for details
29 +on USE-ordering in Portage.
30 </important>
31
32 <codesample lang="ebuild">
33 @@ -348,8 +349,8 @@ needs.
34 The <c>VIDEO_CARDS</c>, <c>INPUT_DEVICES</c> and <c>L10N</c> variables
35 are automatically expanded into USE flags. These are known as
36 <c>USE_EXPAND</c> variables. If the user has <c>L10N="en fr"</c> in
37 -<c>make.conf</c>, for example, then <c>USE="l10n_en l10n_fr"</c> will
38 -automatically be set by Portage.
39 +<c><uri link="::eclass-reference/make.conf/"/></c>, for example, then
40 +<c>USE="l10n_en l10n_fr"</c> will automatically be set by Portage.
41 </p>
42
43 <p>
44
45 diff --git a/general-concepts/user-environment/text.xml b/general-concepts/user-environment/text.xml
46 index d28b844..c2c02e7 100644
47 --- a/general-concepts/user-environment/text.xml
48 +++ b/general-concepts/user-environment/text.xml
49 @@ -2,15 +2,17 @@
50 <guide self="general-concepts/user-environment/">
51 <chapter>
52 <title>User Environment</title>
53 -
54 <body>
55 +
56 <p>
57 -User environment variables and <c>make.conf</c> settings get passed on to ebuilds.
58 -This can be useful <d/> it's how <c>CFLAGS</c> and friends work, for example <d/> but
59 -it can also result in nasty build-breaking variables like <c>LANG</c> and
60 -<c>LC_ALL</c> getting through. Currently no sanitisation is performed upon the
61 -environment.
62 +User environment variables and
63 +<c><uri link="::eclass-reference/make.conf/"/></c> settings get passed on
64 +to ebuilds. This can be useful <d/> it's how <c>CFLAGS</c> and friends work,
65 +for example <d/> but it can also result in nasty build-breaking variables like
66 +<c>LANG</c> and <c>LC_ALL</c> getting through. Currently no sanitisation is
67 +performed upon the environment.
68 </p>
69 +
70 </body>
71
72 <section>
73
74 diff --git a/profiles/make.defaults/text.xml b/profiles/make.defaults/text.xml
75 index 15ea2c6..03aa8db 100644
76 --- a/profiles/make.defaults/text.xml
77 +++ b/profiles/make.defaults/text.xml
78 @@ -5,11 +5,12 @@
79 <body>
80
81 <p>
82 -The <c>make.defaults</c> file in <c>profiles/</c> provides a minimal set of defaults
83 -for the kinds of values which may be set in <c>make.conf</c> (<c>CFLAGS</c>, <c>USE</c>,
84 -<c>FEATURES</c> etc) along with certain control variables (eg <c>USE_EXPAND</c>).
85 -These values can further be refined by additional <c>make.defaults</c> files in
86 -subprofiles.
87 +The <c>make.defaults</c> file in <c>profiles/</c> provides a minimal set
88 +of defaults for the kinds of values which may be set in
89 +<c><uri link="::eclass-reference/make.conf/"/></c> (<c>CFLAGS</c>,
90 +<c>USE</c>, <c>FEATURES</c> etc.) along with certain control variables
91 +(e.g. <c>USE_EXPAND</c>). These values can further be refined by additional
92 +<c>make.defaults</c> files in subprofiles.
93 </p>
94
95 <p>