| 1 |
Bug: 468202 |
| 2 |
--- |
| 3 |
eapi-differences.tex | 3 ++- |
| 4 |
pkg-mgr-commands.tex | 21 +++++++++++++++------ |
| 5 |
2 files changed, 17 insertions(+), 7 deletions(-) |
| 6 |
|
| 7 |
diff --git a/eapi-differences.tex b/eapi-differences.tex |
| 8 |
index 980cbd8..b3035e3 100644 |
| 9 |
--- a/eapi-differences.tex |
| 10 |
+++ b/eapi-differences.tex |
| 11 |
@@ -184,7 +184,7 @@ Option \t{-{}-host-root} & \compactfeatureref{host-root-option} & |
| 12 |
\t{econf} arguments & \compactfeatureref{econf-options} & |
| 13 |
& & disable dependency tracking & |
| 14 |
disable dependency tracking, disable silent rules & |
| 15 |
- disable dependency tracking, disable silent rules \\ |
| 16 |
+ disable dependency tracking, disable silent rules, docdir, htmldir \\ |
| 17 |
|
| 18 |
\t{dodoc -r} & \compactfeatureref{dodoc} & |
| 19 |
No & No & Yes & Yes & Yes \\ |
| 20 |
@@ -336,6 +336,7 @@ EAPI 6 is EAPI 5 with the following changes: |
| 21 |
\item \t{die} and \t{assert} called with \t{-n} respect \t{nonfatal}, \featureref{nonfatal-die}. |
| 22 |
\item \t{eapply} support, \featureref{eapply}. |
| 23 |
\item \t{eapply\_user} support, \featureref{eapply-user}. |
| 24 |
+\item \t{econf} adds \t{-{}-docdir} and \t{-{}-htmldir}, \featureref{econf-options}. |
| 25 |
\end{compactitem} |
| 26 |
|
| 27 |
\ChangeWhenAddingAnEAPI{6} |
| 28 |
diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex |
| 29 |
index 680340a..961af2a 100644 |
| 30 |
--- a/pkg-mgr-commands.tex |
| 31 |
+++ b/pkg-mgr-commands.tex |
| 32 |
@@ -228,6 +228,12 @@ current phase function has returned. |
| 33 |
\item -{}-datadir must be \t{\$\{EPREFIX\}/usr/share} |
| 34 |
\item -{}-sysconfdir must be \t{\$\{EPREFIX\}/etc} |
| 35 |
\item -{}-localstatedir must be \t{\$\{EPREFIX\}/var/lib} |
| 36 |
+ \item -{}-docdir must be \t{\$\{EPREFIX\}/usr/share/doc/\$\{PF\}}, if the EAPI is listed in |
| 37 |
+ table~\ref{tab:econf-options-table} as using it. This option will only be passed if the |
| 38 |
+ string \t{-{}-docdir} occurs in the output of \t{configure -{}-help}. |
| 39 |
+ \item -{}-htmldir must be \t{\$\{EPREFIX\}/usr/share/doc/\$\{PF\}/html}, if the EAPI is listed |
| 40 |
+ in table~\ref{tab:econf-options-table} as using it. This option will only be passed if the |
| 41 |
+ string \t{-{}-htmldir} occurs in the output of \t{configure -{}-help}. |
| 42 |
\item -{}-host must be the value of the \t{CHOST} environment variable. |
| 43 |
\item -{}-libdir must be set according to Algorithm~\ref{alg:econf-libdir}. |
| 44 |
\item -{}-disable-dependency-tracking, if the EAPI is listed in |
| 45 |
@@ -241,15 +247,18 @@ current phase function has returned. |
| 46 |
\ChangeWhenAddingAnEAPI{6} |
| 47 |
\begin{centertable}{Extra \t{econf} arguments for EAPIs} |
| 48 |
\label{tab:econf-options-table} |
| 49 |
- \begin{tabular}{ l l l } |
| 50 |
+ \begin{tabular}{ l l l l l } |
| 51 |
\toprule |
| 52 |
\multicolumn{1}{c}{\textbf{EAPI}} & |
| 53 |
- \multicolumn{1}{c}{\textbf{-{}-disable-dependency-tracking?}} & |
| 54 |
- \multicolumn{1}{c}{\textbf{-{}-disable-silent-rules?}} \\ |
| 55 |
+ \multicolumn{1}{c}{\textbf{-{}-disable-dependency-tracking}} & |
| 56 |
+ \multicolumn{1}{c}{\textbf{-{}-disable-silent-rules}} & |
| 57 |
+ \multicolumn{1}{c}{\textbf{-{}-docdir}} & |
| 58 |
+ \multicolumn{1}{c}{\textbf{-{}-htmldir}} \\ |
| 59 |
\midrule |
| 60 |
- 0, 1, 2, 3 & No & No \\ |
| 61 |
- 4 & Yes & No \\ |
| 62 |
- 5, 6 & Yes & Yes \\ |
| 63 |
+ 0, 1, 2, 3 & No & No & No & No \\ |
| 64 |
+ 4 & Yes & No & No & No \\ |
| 65 |
+ 5 & Yes & Yes & No & No \\ |
| 66 |
+ 6 & Yes & Yes & Yes & Yes \\ |
| 67 |
\bottomrule |
| 68 |
\end{tabular} |
| 69 |
\end{centertable} |
| 70 |
-- |
| 71 |
2.6.1 |
Archives