Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/pms:eapi-8 commit in: /
Date: Tue, 18 May 2021 05:44:42
Message-Id: 1621316655.b83e5cc464a10838bac580e0b55c046ca98fc164.ulm@gentoo
1 commit: b83e5cc464a10838bac580e0b55c046ca98fc164
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 17 19:30:41 2021 +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=b83e5cc4
7
8 Split the econf options table because it has become too wide
9
10 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
11
12 pkg-mgr-commands.tex | 48 ++++++++++++++++++++++++++++++------------------
13 1 file changed, 30 insertions(+), 18 deletions(-)
14
15 diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex
16 index b8ba853..46507b7 100644
17 --- a/pkg-mgr-commands.tex
18 +++ b/pkg-mgr-commands.tex
19 @@ -319,18 +319,18 @@ commands once the current phase function has returned.
20 \item \t{-{}-infodir} must be \t{\$\{EPREFIX\}/usr/share/info}
21 \item \t{-{}-datadir} must be \t{\$\{EPREFIX\}/usr/share}
22 \item \t{-{}-datarootdir} must be \t{\$\{EPREFIX\}/usr/share}, if the EAPI is listed in
23 - table~\ref{tab:econf-options-table} as using it. This option will only be passed if the
24 + table~\ref{tab:econf-options-1} as using it. This option will only be passed if the
25 string \t{-{}-datarootdir} occurs in the output of \t{configure -{}-help}.
26 \item \t{-{}-sysconfdir} must be \t{\$\{EPREFIX\}/etc}
27 \item \t{-{}-localstatedir} must be \t{\$\{EPREFIX\}/var/lib}
28 \item \t{-{}-docdir} must be \t{\$\{EPREFIX\}/usr/share/doc/\$\{PF\}}, if the EAPI is listed in
29 - table~\ref{tab:econf-options-table} as using it. This option will only be passed if the
30 + table~\ref{tab:econf-options-1} as using it. This option will only be passed if the
31 string \t{-{}-docdir} occurs in the output of \t{configure -{}-help}.
32 \item \t{-{}-htmldir} must be \t{\$\{EPREFIX\}/usr/share/doc/\$\{PF\}/html}, if the EAPI is
33 - listed in table~\ref{tab:econf-options-table} as using it. This option will only be passed
34 + listed in table~\ref{tab:econf-options-1} as using it. This option will only be passed
35 if the string \t{-{}-htmldir} occurs in the output of \t{configure -{}-help}.
36 \item \t{-{}-with-sysroot} must be \t{\$\{ESYSROOT:-/\}}, 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 + table~\ref{tab:econf-options-1} as using it. This option will only be passed if the
39 string \t{-{}-with-sysroot} occurs in the output of \t{configure -{}-help}.
40 \item \t{-{}-build} must be the value of the \t{CBUILD} environment variable. This option will
41 only be passed if \t{CBUILD} is non-empty.
42 @@ -339,36 +339,48 @@ commands once the current phase function has returned.
43 only be passed if \t{CTARGET} is non-empty.
44 \item \t{-{}-libdir} must be set according to algorithm~\ref{alg:econf-libdir}.
45 \item \t{-{}-disable-dependency-tracking}, if the EAPI is listed in
46 - table~\ref{tab:econf-options-table} as using it. This option will only be passed if the
47 + table~\ref{tab:econf-options-2} as using it. This option will only be passed if the
48 string \t{-{}-disable-dependency-tracking} occurs in the output of \t{configure -{}-help}.
49 - \item \t{-{}-disable-silent-rules}, if the EAPI is listed in table~\ref{tab:econf-options-table}
50 + \item \t{-{}-disable-silent-rules}, if the EAPI is listed in table~\ref{tab:econf-options-2}
51 as using it. This option will only be passed if the string \t{-{}-disable-silent-rules}
52 occurs in the output of \t{configure -{}-help}.
53 - \item \t{-{}-disable-static}, if the EAPI is listed in table~\ref{tab:econf-options-table}
54 + \item \t{-{}-disable-static}, if the EAPI is listed in table~\ref{tab:econf-options-2}
55 as using it. This option will only be passed if the string \t{-{}-disable-static} occurs
56 in the output of \t{configure -{}-help}.
57 \end{itemize}
58
59 \ChangeWhenAddingAnEAPI{8}
60 \begin{centertable}{Extra \t{econf} arguments for EAPIs}
61 - \label{tab:econf-options-table}
62 - \begin{tabular}{llllllll}
63 + \label{tab:econf-options-1}
64 + \begin{tabular}{lllll}
65 \toprule
66 \multicolumn{1}{c}{\textbf{EAPI}} &
67 - \multicolumn{1}{P{9em}}{\textbf{-{}-disable-dependency-tracking}} &
68 - \multicolumn{1}{P{5em}}{\textbf{-{}-disable-silent-rules}} &
69 - \multicolumn{1}{c}{\textbf{-{}-disable-static}} &
70 \multicolumn{1}{c}{\textbf{-{}-datarootdir}} &
71 \multicolumn{1}{c}{\textbf{-{}-docdir}} &
72 \multicolumn{1}{c}{\textbf{-{}-htmldir}} &
73 \multicolumn{1}{c}{\textbf{-{}-with-sysroot}} \\
74 \midrule
75 - 0, 1, 2, 3 & No & No & No & No & No & No & No \\
76 - 4 & Yes & No & No & No & No & No & No \\
77 - 5 & Yes & Yes & No & No & No & No & No \\
78 - 6 & Yes & Yes & No & No & Yes & Yes & No \\
79 - 7 & Yes & Yes & No & No & Yes & Yes & Yes \\
80 - 8 & Yes & Yes & Yes & Yes & Yes & Yes & Yes \\
81 + 0, 1, 2, 3, 4, 5 & No & No & No & No \\
82 + 6 & No & Yes & Yes & No \\
83 + 7 & No & Yes & Yes & Yes \\
84 + 8 & Yes & Yes & Yes & Yes \\
85 + \bottomrule
86 + \end{tabular}
87 + % Don't start a new table environment, or the two parts may end up on different pages
88 + \vspace{\floatsep}
89 + \caption{Extra \t{econf} arguments for EAPIs (continued)}
90 + \label{tab:econf-options-2}
91 + \begin{tabular}{llll}
92 + \toprule
93 + \multicolumn{1}{c}{\textbf{EAPI}} &
94 + \multicolumn{1}{P{9em}}{\textbf{-{}-disable-dependency-tracking}} &
95 + \multicolumn{1}{P{5em}}{\textbf{-{}-disable-silent-rules}} &
96 + \multicolumn{1}{c}{\textbf{-{}-disable-static}} \\
97 + \midrule
98 + 0, 1, 2, 3 & No & No & No \\
99 + 4 & Yes & No & No \\
100 + 5, 6, 7 & Yes & Yes & No \\
101 + 8 & Yes & Yes & Yes \\
102 \bottomrule
103 \end{tabular}
104 \end{centertable}