commit: 7dc54ec9b8ff7588057672f5053a1885d61516be Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Sun Sep 17 21:23:58 2017 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Sun Feb 18 13:35:54 2018 +0000 URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=7dc54ec9
EAPI 7 has SYSROOT and ESYSROOT Bug: https://bugs.gentoo.org/317337 eapi-differences.tex | 4 ++++ ebuild-env-vars.tex | 34 +++++++++++++++++++++++++--------- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/eapi-differences.tex b/eapi-differences.tex index 21411eb..9c769b5 100644 --- a/eapi-differences.tex +++ b/eapi-differences.tex @@ -155,6 +155,9 @@ Parallel tests & \compactfeatureref{parallel-tests} & \t{ECLASSDIR} & \compactfeatureref{eclassdir} & Yes & Yes & Yes & Yes & No \\ +\t{SYSROOT}, \t{ESYSROOT} & \compactfeatureref{sysroot} & + No & No & No & No & Yes \\ + \t{DESTTREE} & \compactfeatureref{desttree} & Yes & Yes & Yes & Yes & No \\ @@ -420,6 +423,7 @@ EAPI 7 is EAPI 6 with the following changes: \item \t{ECLASSDIR} is gone, \featureref{eclassdir}. \item \t{DESTTREE} is gone, \featureref{desttree}. \item \t{INSDESTTREE} is gone, \featureref{insdesttree}. +\item \t{SYSROOT} and \t{ESYSROOT}, \featureref{sysroot}. \item \t{ROOT}, \t{EROOT}, \t{D}, \t{ED} no longer end with a trailing slash, \featureref{trailing-slash}. \end{compactitem} diff --git a/ebuild-env-vars.tex b/ebuild-env-vars.tex index 27417bf..1e34488 100644 --- a/ebuild-env-vars.tex +++ b/ebuild-env-vars.tex @@ -132,6 +132,18 @@ variable. for convenience. See also the \t{EPREFIX} variable. Only for EAPIs listed in table~\ref{tab:offset-env-vars-table} as supporting \t{EROOT}\@. The presence of a trailing slash is EAPI dependent as listed in table~\ref{tab:trailing-slash}. \\ +\t{SYSROOT} & + \t{src_*} & + No & + \featurelabel{sysroot} The absolute path to the root directory containing build dependencies + satisfied by \t{DEPEND}\@. Only for EAPIs listed in table~\ref{tab:added-env-vars-table} + as supporting \t{SYSROOT}. \\ +\t{ESYSROOT} & + \t{src_*} & + No & + Contains the concatenation of the paths in the \t{SYSROOT} and \t{EPREFIX} variables, + for convenience. See also the \t{EPREFIX} variable. Only for EAPIs listed + in table~\ref{tab:offset-env-vars-table} as supporting \t{ESYSROOT}. \\ \t{T} & All & Partially\footnote{Consistent and preserved across a single connected sequence of install or @@ -244,17 +256,19 @@ variable. \ChangeWhenAddingAnEAPI{7} \begin{centertable}{EAPIs supporting various added env variables} \label{tab:added-env-vars-table} - \begin{tabular}{lllll} + \begin{tabular}{llllll} \toprule \multicolumn{1}{c}{\textbf{EAPI}} & \multicolumn{1}{c}{\textbf{\t{MERGE_TYPE}?}} & \multicolumn{1}{P{6em}}{\textbf{\t{REPLACING_VERSIONS}?}} & \multicolumn{1}{P{6em}}{\textbf{\t{REPLACED_BY_VERSION}?}} & - \multicolumn{1}{P{6em}}{\textbf{\t{EBUILD_PHASE_FUNC}?}} \\ + \multicolumn{1}{P{6em}}{\textbf{\t{EBUILD_PHASE_FUNC}?}} & + \multicolumn{1}{c}{\textbf{\t{SYSROOT}?}} \\ \midrule - 0, 1, 2, 3 & No & No & No & No \\ - 4 & Yes & Yes & Yes & No \\ - 5, 6, 7 & Yes & Yes & Yes & Yes \\ + 0, 1, 2, 3 & No & No & No & No & No \\ + 4 & Yes & Yes & Yes & No & No \\ + 5, 6 & Yes & Yes & Yes & Yes & No \\ + 7 & Yes & Yes & Yes & Yes & Yes \\ \bottomrule \end{tabular} \end{centertable} @@ -282,15 +296,17 @@ variable. \ChangeWhenAddingAnEAPI{7} \begin{centertable}{EAPIs supporting offset-prefix env variables} \label{tab:offset-env-vars-table} - \begin{tabular}{llll} + \begin{tabular}{lllll} \toprule \multicolumn{1}{c}{\textbf{EAPI}} & \multicolumn{1}{c}{\textbf{\t{EPREFIX}?}} & \multicolumn{1}{c}{\textbf{\t{EROOT}?}} & - \multicolumn{1}{c}{\textbf{\t{ED}?}} \\ + \multicolumn{1}{c}{\textbf{\t{ED}?}} & + \multicolumn{1}{c}{\textbf{\t{ESYSROOT}?}} \\ \midrule - 0, 1, 2 & No & No & No \\ - 3, 4, 5, 6, 7 & Yes & Yes & Yes \\ + 0, 1, 2 & No & No & No & No \\ + 3, 4, 5, 6 & Yes & Yes & Yes & No \\ + 7 & Yes & Yes & Yes & Yes \\ \bottomrule \end{tabular} \end{centertable}
