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