1 |
commit: b4e36f9fa0f3b90c7d119ffdfc38e62bc292bdaa |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 21 18:57:30 2022 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 22 18:29:58 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=b4e36f9f |
7 |
|
8 |
EAPI 9: econf matches configure --help output better |
9 |
|
10 |
Bug: https://bugs.gentoo.org/815169 |
11 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
12 |
|
13 |
eapi-differences.tex | 4 ++++ |
14 |
pkg-mgr-commands.tex | 18 ++++++++++++++++++ |
15 |
2 files changed, 22 insertions(+) |
16 |
|
17 |
diff --git a/eapi-differences.tex b/eapi-differences.tex |
18 |
index 9e7f269..5671c22 100644 |
19 |
--- a/eapi-differences.tex |
20 |
+++ b/eapi-differences.tex |
21 |
@@ -141,6 +141,9 @@ Output commands use stdout & \compactfeatureref{output-no-stdout} & |
22 |
\t{econf -{}-disable-static} & \compactfeatureref{econf-options} & |
23 |
No & No & Yes & Yes \\ |
24 |
|
25 |
+\t{econf} better matching of options & \compactfeatureref{econf-options} & |
26 |
+ No & No & No & Yes \\ |
27 |
+ |
28 |
\t{domo} destination path & \compactfeatureref{domo-path} & |
29 |
\t{\$\{DESTTREE\}} & \t{/usr} & \t{/usr} & \t{/usr} \\ |
30 |
|
31 |
@@ -360,6 +363,7 @@ EAPI 9 is EAPI 8 with the following changes: |
32 |
\begin{compactitem} |
33 |
\item Comments in profiles \t{parent} file, \featureref{parent-comments}. |
34 |
\item Different default EAPI for profiles, \featureref{profile-eapi-default}. |
35 |
+\item \t{econf} matches \t{configure -{}-help} output better, \featureref{econf-options}. |
36 |
|
37 |
\end{compactitem} |
38 |
|
39 |
|
40 |
diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex |
41 |
index 7d2511f..e532026 100644 |
42 |
--- a/pkg-mgr-commands.tex |
43 |
+++ b/pkg-mgr-commands.tex |
44 |
@@ -345,6 +345,10 @@ commands once the current phase function has returned. |
45 |
\t{-{}-enable-static} occurs in the output of \t{configure -{}-help}. |
46 |
\end{itemize} |
47 |
|
48 |
+ For EAPIs listed in table~\ref{tab:econf-match-end} as matching the end of the option string, |
49 |
+ a string in \t{configure -{}-help} output will only match if is is not immediately followed by |
50 |
+ any of the characters \t{[A-Za-z0-9+_.-]}. |
51 |
+ |
52 |
\ChangeWhenAddingAnEAPI{9} % two places |
53 |
\begin{centertable}{Extra \t{econf} arguments for EAPIs} |
54 |
\label{tab:econf-options-table} |
55 |
@@ -374,6 +378,20 @@ commands once the current phase function has returned. |
56 |
\end{tabular} |
57 |
\end{centertable} |
58 |
|
59 |
+ \ChangeWhenAddingAnEAPI{9} |
60 |
+ \begin{centertable}{EAPIs matching end of option string in \t{configure -{}-help} output} |
61 |
+ \label{tab:econf-match-end} |
62 |
+ \begin{tabular}{ll} |
63 |
+ \toprule |
64 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
65 |
+ \multicolumn{1}{c}{\textbf{Matches end of option string?}} \\ |
66 |
+ \midrule |
67 |
+ 0, 1, 2, 3, 4, 5, 6, 7, 8 & No \\ |
68 |
+ 9 & Yes \\ |
69 |
+ \bottomrule |
70 |
+ \end{tabular} |
71 |
+ \end{centertable} |
72 |
+ |
73 |
Note that the \t{\$\{EPREFIX\}} component represents the same offset-prefix as described in |
74 |
table~\ref{tab:defined-vars}. It facilitates offset-prefix installations which is supported by |
75 |
EAPIs listed in table~\ref{tab:offset-env-vars-table}. When no offset-prefix installation is in |