commit: 0d733c074bc7c4eebd01164904e73059433888ad Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Tue Dec 24 09:46:26 2019 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Sun May 16 12:07:44 2021 +0000 URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=0d733c07
EAPI 8 has econf passing --datarootdir Bug: https://bugs.gentoo.org/651958 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> eapi-differences.tex | 3 ++- pkg-mgr-commands.tex | 23 ++++++++++++++--------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/eapi-differences.tex b/eapi-differences.tex index 8c75e7d..c98f572 100644 --- a/eapi-differences.tex +++ b/eapi-differences.tex @@ -254,7 +254,7 @@ Output commands use stdout & \compactfeatureref{output-no-stdout} & disable dependency tracking, disable silent rules & disable dependency tracking, disable silent rules, docdir, htmldir & disable dependency tracking, disable silent rules, docdir, htmldir, with sysroot & - disable dependency tracking, disable silent rules, docdir, htmldir, with sysroot \\ + disable dependency tracking, disable silent rules, docdir, htmldir, with sysroot, datarootdir \\ \t{dodoc -r} & \compactfeatureref{dodoc} & * & Yes & Yes & Yes & Yes \\ @@ -489,6 +489,7 @@ EAPI 8 is EAPI 7 with the following changes: \begin{compactitem} \item Selective fetch/mirror restriction, \featureref{uri-restrict}. \item \t{IDEPEND}, \featureref{idepend}. +\item \t{econf} adds \t{-{}-datarootdir}, \featureref{econf-options}. \end{compactitem} \ChangeWhenAddingAnEAPI{8} diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex index f401472..c61ad20 100644 --- a/pkg-mgr-commands.tex +++ b/pkg-mgr-commands.tex @@ -301,6 +301,9 @@ commands once the current phase function has returned. \item \t{-{}-mandir} must be \t{\$\{EPREFIX\}/usr/share/man} \item \t{-{}-infodir} must be \t{\$\{EPREFIX\}/usr/share/info} \item \t{-{}-datadir} must be \t{\$\{EPREFIX\}/usr/share} + \item \t{-{}-datarootdir} must be \t{\$\{EPREFIX\}/usr/share}, if the EAPI is listed in + table~\ref{tab:econf-options-table} as using it. This option will only be passed if the + string \t{-{}-datarootdir} occurs in the output of \t{configure -{}-help}. \item \t{-{}-sysconfdir} must be \t{\$\{EPREFIX\}/etc} \item \t{-{}-localstatedir} must be \t{\$\{EPREFIX\}/var/lib} \item \t{-{}-docdir} must be \t{\$\{EPREFIX\}/usr/share/doc/\$\{PF\}}, if the EAPI is listed in @@ -329,20 +332,22 @@ commands once the current phase function has returned. \ChangeWhenAddingAnEAPI{8} \begin{centertable}{Extra \t{econf} arguments for EAPIs} \label{tab:econf-options-table} - \begin{tabular}{llllll} + \begin{tabular}{lllllll} \toprule \multicolumn{1}{c}{\textbf{EAPI}} & - \multicolumn{1}{P{9em}}{\textbf{-{}-disable-dependency-tracking}} & - \multicolumn{1}{P{5em}}{\textbf{-{}-disable-silent-rules}} & + \multicolumn{1}{P{5.5em}}{\textbf{-{}-disable-dependency-tracking}} & + \multicolumn{1}{P{4em}}{\textbf{-{}-disable-silent-rules}} & \multicolumn{1}{c}{\textbf{-{}-docdir}} & \multicolumn{1}{c}{\textbf{-{}-htmldir}} & - \multicolumn{1}{c}{\textbf{-{}-with-sysroot}} \\ + \multicolumn{1}{P{4em}}{\textbf{-{}-with-sysroot}} & + \multicolumn{1}{c}{\textbf{-{}-datarootdir}} \\ \midrule - 0, 1, 2, 3 & No & No & No & No & No \\ - 4 & Yes & No & No & No & No \\ - 5 & Yes & Yes & No & No & No \\ - 6 & Yes & Yes & Yes & Yes & No \\ - 7, 8 & Yes & Yes & Yes & Yes & Yes \\ + 0, 1, 2, 3 & No & No & No & No & No & No \\ + 4 & Yes & No & No & No & No & No \\ + 5 & Yes & Yes & No & No & No & No \\ + 6 & Yes & Yes & Yes & Yes & No & No \\ + 7 & Yes & Yes & Yes & Yes & Yes & No \\ + 8 & Yes & Yes & Yes & Yes & Yes & Yes \\ \bottomrule \end{tabular} \end{centertable}
