| 1 |
commit: c338011544c5745bc373141bcac536c1b67faacb |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 17 21:23:58 2017 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 24 12:55:24 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=c3380115 |
| 7 |
|
| 8 |
EAPI 7 has SYSROOT and ESYSROOT |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/317337 |
| 11 |
|
| 12 |
eapi-differences.tex | 4 ++++ |
| 13 |
ebuild-env-vars.tex | 34 +++++++++++++++++++++++++--------- |
| 14 |
2 files changed, 29 insertions(+), 9 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eapi-differences.tex b/eapi-differences.tex |
| 17 |
index 21411eb..9c769b5 100644 |
| 18 |
--- a/eapi-differences.tex |
| 19 |
+++ b/eapi-differences.tex |
| 20 |
@@ -155,6 +155,9 @@ Parallel tests & \compactfeatureref{parallel-tests} & |
| 21 |
\t{ECLASSDIR} & \compactfeatureref{eclassdir} & |
| 22 |
Yes & Yes & Yes & Yes & No \\ |
| 23 |
|
| 24 |
+\t{SYSROOT}, \t{ESYSROOT} & \compactfeatureref{sysroot} & |
| 25 |
+ No & No & No & No & Yes \\ |
| 26 |
+ |
| 27 |
\t{DESTTREE} & \compactfeatureref{desttree} & |
| 28 |
Yes & Yes & Yes & Yes & No \\ |
| 29 |
|
| 30 |
@@ -420,6 +423,7 @@ EAPI 7 is EAPI 6 with the following changes: |
| 31 |
\item \t{ECLASSDIR} is gone, \featureref{eclassdir}. |
| 32 |
\item \t{DESTTREE} is gone, \featureref{desttree}. |
| 33 |
\item \t{INSDESTTREE} is gone, \featureref{insdesttree}. |
| 34 |
+\item \t{SYSROOT} and \t{ESYSROOT}, \featureref{sysroot}. |
| 35 |
\item \t{ROOT}, \t{EROOT}, \t{D}, \t{ED} no longer end with a trailing slash, |
| 36 |
\featureref{trailing-slash}. |
| 37 |
\end{compactitem} |
| 38 |
|
| 39 |
diff --git a/ebuild-env-vars.tex b/ebuild-env-vars.tex |
| 40 |
index 27417bf..1e34488 100644 |
| 41 |
--- a/ebuild-env-vars.tex |
| 42 |
+++ b/ebuild-env-vars.tex |
| 43 |
@@ -132,6 +132,18 @@ variable. |
| 44 |
for convenience. See also the \t{EPREFIX} variable. Only for EAPIs listed in |
| 45 |
table~\ref{tab:offset-env-vars-table} as supporting \t{EROOT}\@. The presence of a trailing |
| 46 |
slash is EAPI dependent as listed in table~\ref{tab:trailing-slash}. \\ |
| 47 |
+\t{SYSROOT} & |
| 48 |
+ \t{src_*} & |
| 49 |
+ No & |
| 50 |
+ \featurelabel{sysroot} The absolute path to the root directory containing build dependencies |
| 51 |
+ satisfied by \t{DEPEND}\@. Only for EAPIs listed in table~\ref{tab:added-env-vars-table} |
| 52 |
+ as supporting \t{SYSROOT}. \\ |
| 53 |
+\t{ESYSROOT} & |
| 54 |
+ \t{src_*} & |
| 55 |
+ No & |
| 56 |
+ Contains the concatenation of the paths in the \t{SYSROOT} and \t{EPREFIX} variables, |
| 57 |
+ for convenience. See also the \t{EPREFIX} variable. Only for EAPIs listed |
| 58 |
+ in table~\ref{tab:offset-env-vars-table} as supporting \t{ESYSROOT}. \\ |
| 59 |
\t{T} & |
| 60 |
All & |
| 61 |
Partially\footnote{Consistent and preserved across a single connected sequence of install or |
| 62 |
@@ -244,17 +256,19 @@ variable. |
| 63 |
\ChangeWhenAddingAnEAPI{7} |
| 64 |
\begin{centertable}{EAPIs supporting various added env variables} |
| 65 |
\label{tab:added-env-vars-table} |
| 66 |
- \begin{tabular}{lllll} |
| 67 |
+ \begin{tabular}{llllll} |
| 68 |
\toprule |
| 69 |
\multicolumn{1}{c}{\textbf{EAPI}} & |
| 70 |
\multicolumn{1}{c}{\textbf{\t{MERGE_TYPE}?}} & |
| 71 |
\multicolumn{1}{P{6em}}{\textbf{\t{REPLACING_VERSIONS}?}} & |
| 72 |
\multicolumn{1}{P{6em}}{\textbf{\t{REPLACED_BY_VERSION}?}} & |
| 73 |
- \multicolumn{1}{P{6em}}{\textbf{\t{EBUILD_PHASE_FUNC}?}} \\ |
| 74 |
+ \multicolumn{1}{P{6em}}{\textbf{\t{EBUILD_PHASE_FUNC}?}} & |
| 75 |
+ \multicolumn{1}{c}{\textbf{\t{SYSROOT}?}} \\ |
| 76 |
\midrule |
| 77 |
- 0, 1, 2, 3 & No & No & No & No \\ |
| 78 |
- 4 & Yes & Yes & Yes & No \\ |
| 79 |
- 5, 6, 7 & Yes & Yes & Yes & Yes \\ |
| 80 |
+ 0, 1, 2, 3 & No & No & No & No & No \\ |
| 81 |
+ 4 & Yes & Yes & Yes & No & No \\ |
| 82 |
+ 5, 6 & Yes & Yes & Yes & Yes & No \\ |
| 83 |
+ 7 & Yes & Yes & Yes & Yes & Yes \\ |
| 84 |
\bottomrule |
| 85 |
\end{tabular} |
| 86 |
\end{centertable} |
| 87 |
@@ -282,15 +296,17 @@ variable. |
| 88 |
\ChangeWhenAddingAnEAPI{7} |
| 89 |
\begin{centertable}{EAPIs supporting offset-prefix env variables} |
| 90 |
\label{tab:offset-env-vars-table} |
| 91 |
- \begin{tabular}{llll} |
| 92 |
+ \begin{tabular}{lllll} |
| 93 |
\toprule |
| 94 |
\multicolumn{1}{c}{\textbf{EAPI}} & |
| 95 |
\multicolumn{1}{c}{\textbf{\t{EPREFIX}?}} & |
| 96 |
\multicolumn{1}{c}{\textbf{\t{EROOT}?}} & |
| 97 |
- \multicolumn{1}{c}{\textbf{\t{ED}?}} \\ |
| 98 |
+ \multicolumn{1}{c}{\textbf{\t{ED}?}} & |
| 99 |
+ \multicolumn{1}{c}{\textbf{\t{ESYSROOT}?}} \\ |
| 100 |
\midrule |
| 101 |
- 0, 1, 2 & No & No & No \\ |
| 102 |
- 3, 4, 5, 6, 7 & Yes & Yes & Yes \\ |
| 103 |
+ 0, 1, 2 & No & No & No & No \\ |
| 104 |
+ 3, 4, 5, 6 & Yes & Yes & Yes & No \\ |
| 105 |
+ 7 & Yes & Yes & Yes & Yes \\ |
| 106 |
\bottomrule |
| 107 |
\end{tabular} |
| 108 |
\end{centertable} |
Archives