summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2019-12-24 10:46:26 +0100
committerUlrich Müller <ulm@gentoo.org>2021-06-05 10:55:38 +0200
commit5001b56490c821aa8e77f67f9e9bb62e804fa129 (patch)
tree409c9c14830d2e49d2569f6547ccf31be2fc79c6
parentEAPI 8: useq, hasv and hasq are banned (diff)
downloadpms-5001b56490c821aa8e77f67f9e9bb62e804fa129.tar.gz
pms-5001b56490c821aa8e77f67f9e9bb62e804fa129.tar.bz2
pms-5001b56490c821aa8e77f67f9e9bb62e804fa129.zip
EAPI 8 has econf passing --datarootdir
Bug: https://bugs.gentoo.org/651958 Signed-off-by: Michał Górny <mgorny@gentoo.org> Signed-off-by: Ulrich Müller <ulm@gentoo.org>
-rw-r--r--eapi-differences.tex3
-rw-r--r--pkg-mgr-commands.tex17
2 files changed, 13 insertions, 7 deletions
diff --git a/eapi-differences.tex b/eapi-differences.tex
index a2a74b8..32f4a66 100644
--- a/eapi-differences.tex
+++ b/eapi-differences.tex
@@ -272,7 +272,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, datarootdir, docdir, htmldir, with sysroot \\
\t{dodoc -r} & \compactfeatureref{dodoc} &
* & Yes & Yes & Yes & Yes \\
@@ -514,6 +514,7 @@ EAPI 8 is EAPI 7 with the following changes:
\item \t{PROPERTIES} and \t{RESTRICT} accumulated across eclasses, \featureref{accumulate-vars}.
\item \t{useq} banned, \featureref{banned-commands}.
\item \t{hasv} and \t{hasq} banned, \featureref{banned-commands}.
+\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 c56e592..7909bdd 100644
--- a/pkg-mgr-commands.tex
+++ b/pkg-mgr-commands.tex
@@ -312,6 +312,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
@@ -340,20 +343,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}{c}{\textbf{-{}-datarootdir}} &
\multicolumn{1}{c}{\textbf{-{}-docdir}} &
\multicolumn{1}{c}{\textbf{-{}-htmldir}} &
\multicolumn{1}{c}{\textbf{-{}-with-sysroot}} \\
\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 & No & Yes & Yes & No \\
+ 7 & Yes & Yes & No & Yes & Yes & Yes \\
+ 8 & Yes & Yes & Yes & Yes & Yes & Yes \\
\bottomrule
\end{tabular}
\end{centertable}