1 |
From: James Le Cuirot <chewi@g.o> |
2 |
|
3 |
Bug: https://bugs.gentoo.org/317337 |
4 |
--- |
5 |
eapi-differences.tex | 4 ++++ |
6 |
ebuild-env-vars.tex | 47 +++++++++++++++++++++++++++++++++-------------- |
7 |
2 files changed, 37 insertions(+), 14 deletions(-) |
8 |
|
9 |
diff --git a/eapi-differences.tex b/eapi-differences.tex |
10 |
index 9f39934..f3c68f6 100644 |
11 |
--- a/eapi-differences.tex |
12 |
+++ b/eapi-differences.tex |
13 |
@@ -41,6 +41,9 @@ of this document for a complete table of previous EAPIs. |
14 |
\bottomrule |
15 |
\endlastfoot |
16 |
|
17 |
+\t{SYSROOT}, \t{ESYSROOT} & \compactfeatureref{sysroot} & |
18 |
+ No & No & No & No & Yes \\ |
19 |
+ |
20 |
GNU patch version & \compactfeatureref{gnu-patch} & |
21 |
Any & Any & Any & Any & 2.7 \\ |
22 |
|
23 |
@@ -404,6 +407,7 @@ EAPI 7 is EAPI 6 with the following changes: |
24 |
\item \t{ROOT}, \t{EROOT}, \t{D}, \t{ED} no longer end with a trailing slash, |
25 |
\featureref{trailing-slash}. |
26 |
\item \t{patch} is compatible with GNU patch 2.7, \featureref{gnu-patch}. |
27 |
+\item \t{SYSROOT} and \t{ESYSROOT} added, \featureref{sysroot}. |
28 |
\end{compactitem} |
29 |
|
30 |
\ChangeWhenAddingAnEAPI{7} |
31 |
diff --git a/ebuild-env-vars.tex b/ebuild-env-vars.tex |
32 |
index fe61ac5..e24a065 100644 |
33 |
--- a/ebuild-env-vars.tex |
34 |
+++ b/ebuild-env-vars.tex |
35 |
@@ -130,6 +130,20 @@ variable. |
36 |
See also the \t{EPREFIX} variable. Only for EAPIs listed |
37 |
in table~\ref{tab:offset-env-vars-table} as supporting \t{EROOT}. The presence of a trailing |
38 |
slash EAPI-dependent as listed in table~\ref{tab:trailing-slash}. \\ |
39 |
+\t{SYSROOT} & |
40 |
+ \t{src_*} & |
41 |
+ No & |
42 |
+ \featurelabel{sysroot} The absolute path to the root directory containing build dependencies |
43 |
+ satisfied by \t{DEPEND}. Only for EAPIs listed in table~\ref{tab:added-env-vars-table} |
44 |
+ as supporting \t{SYSROOT}. The presence of a trailing slash EAPI-dependent as listed |
45 |
+ in table~\ref{tab:trailing-slash}. \\ |
46 |
+\t{ESYSROOT} & |
47 |
+ \t{src_*} & |
48 |
+ No & |
49 |
+ Contains the concatenation of the paths in \t{SYSROOT} and \t{EPREFIX} variables, |
50 |
+ for convenience. See also the \t{EPREFIX} variable. Only for EAPIs listed |
51 |
+ in table~\ref{tab:offset-env-vars-table} as supporting \t{ESYSROOT}. The presence of a trailing |
52 |
+ slash EAPI-dependent as listed in table~\ref{tab:trailing-slash}. \\ |
53 |
\t{T} & |
54 |
All & |
55 |
Partially\footnote{Consistent and preserved across a single connected sequence of install or |
56 |
@@ -239,17 +253,19 @@ variable. |
57 |
\ChangeWhenAddingAnEAPI{7} |
58 |
\begin{centertable}{EAPIs supporting various added env variables} |
59 |
\label{tab:added-env-vars-table} |
60 |
- \begin{tabular}{lllll} |
61 |
+ \begin{tabular}{llllll} |
62 |
\toprule |
63 |
\multicolumn{1}{c}{\textbf{EAPI}} & |
64 |
\multicolumn{1}{c}{\textbf{\t{MERGE_TYPE}?}} & |
65 |
\multicolumn{1}{P{6em}}{\textbf{\t{REPLACING_VERSIONS}?}} & |
66 |
\multicolumn{1}{P{6em}}{\textbf{\t{REPLACED_BY_VERSION}?}} & |
67 |
- \multicolumn{1}{P{6em}}{\textbf{\t{EBUILD_PHASE_FUNC}?}} \\ |
68 |
+ \multicolumn{1}{P{6em}}{\textbf{\t{EBUILD_PHASE_FUNC}?}} & |
69 |
+ \multicolumn{1}{P{6em}}{\textbf{\t{SYSROOT}?}} \\ |
70 |
\midrule |
71 |
- 0, 1, 2, 3 & No & No & No & No \\ |
72 |
- 4 & Yes & Yes & Yes & No \\ |
73 |
- 5, 6, 7 & Yes & Yes & Yes & Yes \\ |
74 |
+ 0, 1, 2, 3 & No & No & No & No & No \\ |
75 |
+ 4 & Yes & Yes & Yes & No & No \\ |
76 |
+ 5, 6 & Yes & Yes & Yes & Yes & No \\ |
77 |
+ 7 & Yes & Yes & Yes & Yes & Yes \\ |
78 |
\bottomrule |
79 |
\end{tabular} |
80 |
\end{centertable} |
81 |
@@ -272,15 +288,17 @@ variable. |
82 |
\ChangeWhenAddingAnEAPI{7} |
83 |
\begin{centertable}{EAPIs supporting offset-prefix env variables} |
84 |
\label{tab:offset-env-vars-table} |
85 |
- \begin{tabular}{llll} |
86 |
+ \begin{tabular}{lllll} |
87 |
\toprule |
88 |
\multicolumn{1}{c}{\textbf{EAPI}} & |
89 |
\multicolumn{1}{c}{\textbf{\t{EPREFIX}?}} & |
90 |
\multicolumn{1}{c}{\textbf{\t{EROOT}?}} & |
91 |
- \multicolumn{1}{c}{\textbf{\t{ED}?}} \\ |
92 |
+ \multicolumn{1}{c}{\textbf{\t{ED}?}} & |
93 |
+ \multicolumn{1}{c}{\textbf{\t{ESYSROOT}?}} \\ |
94 |
\midrule |
95 |
- 0, 1, 2 & No & No & No \\ |
96 |
- 3, 4, 5, 6, 7 & Yes & Yes & Yes \\ |
97 |
+ 0, 1, 2 & No & No & No & No \\ |
98 |
+ 3, 4, 5, 6 & Yes & Yes & Yes & No \\ |
99 |
+ 7 & Yes & Yes & Yes & Yes \\ |
100 |
\bottomrule |
101 |
\end{tabular} |
102 |
\end{centertable} |
103 |
@@ -442,16 +460,17 @@ If the path specifies the system root directory, it will be empty. |
104 |
\ChangeWhenAddingAnEAPI{7} |
105 |
\begin{centertable}{Variables that always or never end with a trailing slash} |
106 |
\label{tab:trailing-slash} |
107 |
- \begin{tabular}{lll} |
108 |
+ \begin{tabular}{llll} |
109 |
\toprule |
110 |
\multicolumn{1}{c}{\textbf{EAPI}} & |
111 |
- \multicolumn{2}{c}{\textbf{Ends with a trailing slash?}} \\ |
112 |
+ \multicolumn{3}{c}{\textbf{Ends with a trailing slash?}} \\ |
113 |
& |
114 |
\t{ROOT}, \t{EROOT} & |
115 |
- \t{D}, \t{ED} \\ |
116 |
+ \t{D}, \t{ED} & |
117 |
+ \t{SYSROOT}, \t{ESYSROOT} \\ |
118 |
\midrule |
119 |
- 0, 1, 2, 3, 4, 5, 6 & always & always \\ |
120 |
- 7 & never & never \\ |
121 |
+ 0, 1, 2, 3, 4, 5, 6 & always & always & n/a \\ |
122 |
+ 7 & never & never & never \\ |
123 |
\bottomrule |
124 |
\end{tabular} |
125 |
\end{centertable} |
126 |
-- |
127 |
2.14.2 |