commit: 8052e3a1bc25ddd67ad83d8cc0ad36626578ba84 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Sun Sep 17 21:23:58 2017 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Sep 28 20:38:45 2017 +0000 URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=8052e3a1
EAPI 7 has SYSROOT and ESYSROOT Bug: https://bugs.gentoo.org/317337 eapi-differences.tex | 4 ++++ ebuild-env-vars.tex | 47 +++++++++++++++++++++++++++++++++-------------- 2 files changed, 37 insertions(+), 14 deletions(-) diff --git a/eapi-differences.tex b/eapi-differences.tex index 9f39934..f3c68f6 100644 --- a/eapi-differences.tex +++ b/eapi-differences.tex @@ -41,6 +41,9 @@ of this document for a complete table of previous EAPIs. \bottomrule \endlastfoot +\t{SYSROOT}, \t{ESYSROOT} & \compactfeatureref{sysroot} & + No & No & No & No & Yes \\ + GNU patch version & \compactfeatureref{gnu-patch} & Any & Any & Any & Any & 2.7 \\ @@ -404,6 +407,7 @@ EAPI 7 is EAPI 6 with the following changes: \item \t{ROOT}, \t{EROOT}, \t{D}, \t{ED} no longer end with a trailing slash, \featureref{trailing-slash}. \item \t{patch} is compatible with GNU patch 2.7, \featureref{gnu-patch}. +\item \t{SYSROOT} and \t{ESYSROOT} added, \featureref{sysroot}. \end{compactitem} \ChangeWhenAddingAnEAPI{7} diff --git a/ebuild-env-vars.tex b/ebuild-env-vars.tex index fe61ac5..e24a065 100644 --- a/ebuild-env-vars.tex +++ b/ebuild-env-vars.tex @@ -130,6 +130,20 @@ variable. 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 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}. The presence of a trailing slash EAPI-dependent as listed + in table~\ref{tab:trailing-slash}. \\ +\t{ESYSROOT} & + \t{src_*} & + No & + Contains the concatenation of the paths in \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}. The presence of a trailing + slash EAPI-dependent as listed in table~\ref{tab:trailing-slash}. \\ \t{T} & All & Partially\footnote{Consistent and preserved across a single connected sequence of install or @@ -239,17 +253,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}{P{6em}}{\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} @@ -272,15 +288,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} @@ -442,16 +460,17 @@ If the path specifies the system root directory, it will be empty. \ChangeWhenAddingAnEAPI{7} \begin{centertable}{Variables that always or never end with a trailing slash} \label{tab:trailing-slash} - \begin{tabular}{lll} + \begin{tabular}{llll} \toprule \multicolumn{1}{c}{\textbf{EAPI}} & - \multicolumn{2}{c}{\textbf{Ends with a trailing slash?}} \\ + \multicolumn{3}{c}{\textbf{Ends with a trailing slash?}} \\ & \t{ROOT}, \t{EROOT} & - \t{D}, \t{ED} \\ + \t{D}, \t{ED} & + \t{SYSROOT}, \t{ESYSROOT} \\ \midrule - 0, 1, 2, 3, 4, 5, 6 & always & always \\ - 7 & never & never \\ + 0, 1, 2, 3, 4, 5, 6 & always & always & n/a \\ + 7 & never & never & never \\ \bottomrule \end{tabular} \end{centertable}
