[gentoo-commits] proj/pms:eapi-9 commit in: /

[Ulrich Müller]

commit:     2eacc31d620a70f29090e2de227223eb5a05157c
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 21 18:57:30 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 18 15:51:55 2022 +0000
URL:        https://gitweb.gentoo.org/proj/pms.git/commit/?id=2eacc31d

EAPI 9: econf matches configure --help output better

Bug: https://bugs.gentoo.org/815169
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 eapi-differences.tex |  4 ++++
 pkg-mgr-commands.tex | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/eapi-differences.tex b/eapi-differences.tex
index d292bc7..b38ea5d 100644
--- a/eapi-differences.tex
+++ b/eapi-differences.tex
@@ -175,6 +175,9 @@ Output commands use stdout & \compactfeatureref{output-no-stdout} &
     disable dependency tracking, disable silent rules, disable static,
     datarootdir, docdir, htmldir, with sysroot \\
 
+\t{econf} better matching of options & \compactfeatureref{econf-options} &
+    No & No & No & No & Yes \\
+
 \t{domo} destination path & \compactfeatureref{domo-path} &
     \t{\$\{DESTTREE\}} & \t{\$\{DESTTREE\}} & \t{/usr} & \t{/usr} & \t{/usr} \\
 
@@ -413,6 +416,7 @@ EAPI 9 is EAPI 8 with the following changes:
 \begin{compactitem}
 \item Comments in profiles \t{parent} file, \featureref{parent-comments}.
 \item Different default EAPI for profiles, \featureref{profile-eapi-default}.
+\item \t{econf} matches \t{configure -{}-help} output better, \featureref{econf-options}.
 
 \end{compactitem}
 

diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex
index 7d2511f..e532026 100644
--- a/pkg-mgr-commands.tex
+++ b/pkg-mgr-commands.tex
@@ -345,6 +345,10 @@ commands once the current phase function has returned.
         \t{-{}-enable-static} occurs in the output of \t{configure -{}-help}.
     \end{itemize}
 
+    For EAPIs listed in table~\ref{tab:econf-match-end} as matching the end of the option string,
+    a string in \t{configure -{}-help} output will only match if is is not immediately followed by
+    any of the characters \t{[A-Za-z0-9+_.-]}.
+
     \ChangeWhenAddingAnEAPI{9}  % two places
     \begin{centertable}{Extra \t{econf} arguments for EAPIs}
         \label{tab:econf-options-table}
@@ -374,6 +378,20 @@ commands once the current phase function has returned.
         \end{tabular}
     \end{centertable}
 
+    \ChangeWhenAddingAnEAPI{9}
+    \begin{centertable}{EAPIs matching end of option string in \t{configure -{}-help} output}
+        \label{tab:econf-match-end}
+        \begin{tabular}{ll}
+          \toprule
+          \multicolumn{1}{c}{\textbf{EAPI}} &
+          \multicolumn{1}{c}{\textbf{Matches end of option string?}} \\
+          \midrule
+          0, 1, 2, 3, 4, 5, 6, 7, 8 & No  \\
+          9                         & Yes \\
+          \bottomrule
+        \end{tabular}
+    \end{centertable}
+
     Note that the \t{\$\{EPREFIX\}} component represents the same offset-prefix as described in
     table~\ref{tab:defined-vars}. It facilitates offset-prefix installations which is supported by
     EAPIs listed in table~\ref{tab:offset-env-vars-table}. When no offset-prefix installation is in