1 |
From: Michał Górny <mgorny@g.o> |
2 |
|
3 |
Bug: https://bugs.gentoo.org/651958 |
4 |
Signed-off-by: Michał Górny <mgorny@g.o> |
5 |
Signed-off-by: Ulrich Müller <ulm@g.o> |
6 |
--- |
7 |
eapi-differences.tex | 3 ++- |
8 |
pkg-mgr-commands.tex | 17 +++++++++++------ |
9 |
2 files changed, 13 insertions(+), 7 deletions(-) |
10 |
|
11 |
diff --git a/eapi-differences.tex b/eapi-differences.tex |
12 |
index a2a74b8..32f4a66 100644 |
13 |
--- a/eapi-differences.tex |
14 |
+++ b/eapi-differences.tex |
15 |
@@ -272,7 +272,7 @@ Output commands use stdout & \compactfeatureref{output-no-stdout} & |
16 |
disable dependency tracking, disable silent rules & |
17 |
disable dependency tracking, disable silent rules, docdir, htmldir & |
18 |
disable dependency tracking, disable silent rules, docdir, htmldir, with sysroot & |
19 |
- disable dependency tracking, disable silent rules, docdir, htmldir, with sysroot \\ |
20 |
+ disable dependency tracking, disable silent rules, datarootdir, docdir, htmldir, with sysroot \\ |
21 |
|
22 |
\t{dodoc -r} & \compactfeatureref{dodoc} & |
23 |
* & Yes & Yes & Yes & Yes \\ |
24 |
@@ -514,6 +514,7 @@ EAPI 8 is EAPI 7 with the following changes: |
25 |
\item \t{PROPERTIES} and \t{RESTRICT} accumulated across eclasses, \featureref{accumulate-vars}. |
26 |
\item \t{useq} banned, \featureref{banned-commands}. |
27 |
\item \t{hasv} and \t{hasq} banned, \featureref{banned-commands}. |
28 |
+\item \t{econf} adds \t{-{}-datarootdir}, \featureref{econf-options}. |
29 |
\end{compactitem} |
30 |
|
31 |
\ChangeWhenAddingAnEAPI{8} |
32 |
diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex |
33 |
index c56e592..7909bdd 100644 |
34 |
--- a/pkg-mgr-commands.tex |
35 |
+++ b/pkg-mgr-commands.tex |
36 |
@@ -312,6 +312,9 @@ commands once the current phase function has returned. |
37 |
\item \t{-{}-mandir} must be \t{\$\{EPREFIX\}/usr/share/man} |
38 |
\item \t{-{}-infodir} must be \t{\$\{EPREFIX\}/usr/share/info} |
39 |
\item \t{-{}-datadir} must be \t{\$\{EPREFIX\}/usr/share} |
40 |
+ \item \t{-{}-datarootdir} must be \t{\$\{EPREFIX\}/usr/share}, if the EAPI is listed in |
41 |
+ table~\ref{tab:econf-options-table} as using it. This option will only be passed if the |
42 |
+ string \t{-{}-datarootdir} occurs in the output of \t{configure -{}-help}. |
43 |
\item \t{-{}-sysconfdir} must be \t{\$\{EPREFIX\}/etc} |
44 |
\item \t{-{}-localstatedir} must be \t{\$\{EPREFIX\}/var/lib} |
45 |
\item \t{-{}-docdir} must be \t{\$\{EPREFIX\}/usr/share/doc/\$\{PF\}}, if the EAPI is listed in |
46 |
@@ -340,20 +343,22 @@ commands once the current phase function has returned. |
47 |
\ChangeWhenAddingAnEAPI{8} |
48 |
\begin{centertable}{Extra \t{econf} arguments for EAPIs} |
49 |
\label{tab:econf-options-table} |
50 |
- \begin{tabular}{llllll} |
51 |
+ \begin{tabular}{lllllll} |
52 |
\toprule |
53 |
\multicolumn{1}{c}{\textbf{EAPI}} & |
54 |
\multicolumn{1}{P{9em}}{\textbf{-{}-disable-dependency-tracking}} & |
55 |
\multicolumn{1}{P{5em}}{\textbf{-{}-disable-silent-rules}} & |
56 |
+ \multicolumn{1}{c}{\textbf{-{}-datarootdir}} & |
57 |
\multicolumn{1}{c}{\textbf{-{}-docdir}} & |
58 |
\multicolumn{1}{c}{\textbf{-{}-htmldir}} & |
59 |
\multicolumn{1}{c}{\textbf{-{}-with-sysroot}} \\ |
60 |
\midrule |
61 |
- 0, 1, 2, 3 & No & No & No & No & No \\ |
62 |
- 4 & Yes & No & No & No & No \\ |
63 |
- 5 & Yes & Yes & No & No & No \\ |
64 |
- 6 & Yes & Yes & Yes & Yes & No \\ |
65 |
- 7, 8 & Yes & Yes & Yes & Yes & Yes \\ |
66 |
+ 0, 1, 2, 3 & No & No & No & No & No & No \\ |
67 |
+ 4 & Yes & No & No & No & No & No \\ |
68 |
+ 5 & Yes & Yes & No & No & No & No \\ |
69 |
+ 6 & Yes & Yes & No & Yes & Yes & No \\ |
70 |
+ 7 & Yes & Yes & No & Yes & Yes & Yes \\ |
71 |
+ 8 & Yes & Yes & Yes & Yes & Yes & Yes \\ |
72 |
\bottomrule |
73 |
\end{tabular} |
74 |
\end{centertable} |
75 |
-- |
76 |
2.31.1 |