[gentoo-pms] [PATCH eapi-7] EAPI 7: econf passes --build.

[gentoo-pms] [PATCH eapi-7] EAPI 7: econf passes --build.

[Michał Górny]

Explicitly list passing --build by econf, as necessary to pass CBUILD
for cross-compilation. This has probably been missed in previous feature
list for EAPI 7 as Portage is doing it already.
---
 eapi-differences.tex |  3 ++-
 pkg-mgr-commands.tex | 20 ++++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

 TODO: do we want --target for CTARGET as well?

diff --git a/eapi-differences.tex b/eapi-differences.tex
index 2d6fd25..69d5500 100644
--- a/eapi-differences.tex
+++ b/eapi-differences.tex
@@ -257,7 +257,7 @@ Output commands use stdout & \compactfeatureref{output-no-stdout} &
     None & disable dependency tracking &
     disable dependency tracking, disable silent rules &
     disable dependency tracking, disable silent rules, docdir, htmldir &
-    disable dependency tracking, disable silent rules, docdir, htmldir, with sysroot \\
+    disable dependency tracking, disable silent rules, docdir, htmldir, with sysroot, build \\
 
 \t{dodoc -r} & \compactfeatureref{dodoc} &
     No & Yes & Yes & Yes & Yes \\
@@ -487,6 +487,7 @@ EAPI 7 is EAPI 6 with the following changes:
 \item \t{domo} installs to \t{/usr}, \featureref{domo-path}.
 \item Controllable stripping and \t{dostrip}, \featureref{dostrip}.
 \item Version manipulation and comparison commands, \featureref{ver-commands}.
+\item \t{econf} adds \t{-{}-build}, \featureref{econf-options}.
 \end{compactitem}
 
 \ChangeWhenAddingAnEAPI{7}
diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex
index c7ff680..2760ea8 100644
--- a/pkg-mgr-commands.tex
+++ b/pkg-mgr-commands.tex
@@ -340,6 +340,9 @@ current phase function has returned.
     \item -{}-with-sysroot must be \t{\$\{ESYSROOT\}}, if the EAPI is listed in
         table~\ref{tab:econf-options-table} as using it. This option will only be passed if the
         string \t{-{}-with-sysroot} occurs in the output of \t{configure -{}-help}.
+    \item -{}-build must be the value of the \t{CBUILD} environment variable, if the EAPI is listed
+        table~\ref{tab:econf-options-table} as using it. This option will only be passed if the
+        \t{CBUILD} variable is set to a non-empty value.
     \item -{}-host must be the value of the \t{CHOST} environment variable.
     \item -{}-libdir must be set according to Algorithm~\ref{alg:econf-libdir}.
     \item -{}-disable-dependency-tracking, if the EAPI is listed in
@@ -353,20 +356,21 @@ current phase function has returned.
     \ChangeWhenAddingAnEAPI{7}
     \begin{centertable}{Extra \t{econf} arguments for EAPIs}
         \label{tab:econf-options-table}
-        \begin{tabular}{llllll}
+        \begin{tabular}{lllllll}
           \toprule
           \multicolumn{1}{c}{\textbf{EAPI}} &
-          \multicolumn{1}{P{9em}}{\textbf{-{}-disable-dependency-tracking}} &
+          \multicolumn{1}{P{5em}}{\textbf{-{}-disable-dependency-tracking}} &
           \multicolumn{1}{P{5em}}{\textbf{-{}-disable-silent-rules}} &
           \multicolumn{1}{c}{\textbf{-{}-docdir}} &
           \multicolumn{1}{c}{\textbf{-{}-htmldir}} &
-          \multicolumn{1}{c}{\textbf{-{}-with-sysroot}} \\
+          \multicolumn{1}{c}{\textbf{-{}-with-sysroot}} &
+          \multicolumn{1}{c}{\textbf{-{}-build}} \\
           \midrule
-          0, 1, 2, 3        & No  & No  & No  & No  & No  \\
-          4                 & Yes & No  & No  & No  & No  \\
-          5                 & Yes & Yes & No  & No  & No  \\
-          6                 & Yes & Yes & Yes & Yes & No  \\
-          7                 & Yes & Yes & Yes & Yes & Yes \\
+          0, 1, 2, 3        & No  & No  & No  & No  & No  & No  \\
+          4                 & Yes & No  & No  & No  & No  & No  \\
+          5                 & Yes & Yes & No  & No  & No  & No  \\
+          6                 & Yes & Yes & Yes & Yes & No  & No  \\
+          7                 & Yes & Yes & Yes & Yes & Yes & Yes \\
           \bottomrule
         \end{tabular}
     \end{centertable}
-- 
2.16.1

Re: [gentoo-pms] [PATCH eapi-7] EAPI 7: econf passes --build.

[Ulrich Mueller]

[-- Attachment #1: Type: text/plain, Size: 2792 bytes --]

>>>>> On Sat, 17 Feb 2018, Michał Górny wrote:

> --- a/pkg-mgr-commands.tex
> +++ b/pkg-mgr-commands.tex
> @@ -340,6 +340,9 @@ current phase function has returned.
>      \item -{}-with-sysroot must be \t{\$\{ESYSROOT\}}, if the EAPI is listed in
>          table~\ref{tab:econf-options-table} as using it. This option will only be passed if the
>          string \t{-{}-with-sysroot} occurs in the output of \t{configure -{}-help}.
> +    \item -{}-build must be the value of the \t{CBUILD} environment variable, if the EAPI is listed
> +        table~\ref{tab:econf-options-table} as using it. This option will only be passed if the

s/table/in table/

> +        \t{CBUILD} variable is set to a non-empty value.
>      \item -{}-host must be the value of the \t{CHOST} environment variable.
>      \item -{}-libdir must be set according to Algorithm~\ref{alg:econf-libdir}.
>      \item -{}-disable-dependency-tracking, if the EAPI is listed in
> @@ -353,20 +356,21 @@ current phase function has returned.
>      \ChangeWhenAddingAnEAPI{7}
>      \begin{centertable}{Extra \t{econf} arguments for EAPIs}
>          \label{tab:econf-options-table}
> -        \begin{tabular}{llllll}
> +        \begin{tabular}{lllllll}
>            \toprule
>            \multicolumn{1}{c}{\textbf{EAPI}} &
> -          \multicolumn{1}{P{9em}}{\textbf{-{}-disable-dependency-tracking}} &
> +          \multicolumn{1}{P{5em}}{\textbf{-{}-disable-dependency-tracking}} &

This causes an overfull box. Rather leave it at 9em (which will also
save a line) but change --with-sysroot below to P{3em}.

>            \multicolumn{1}{P{5em}}{\textbf{-{}-disable-silent-rules}} &
>            \multicolumn{1}{c}{\textbf{-{}-docdir}} &
>            \multicolumn{1}{c}{\textbf{-{}-htmldir}} &
> -          \multicolumn{1}{c}{\textbf{-{}-with-sysroot}} \\
> +          \multicolumn{1}{c}{\textbf{-{}-with-sysroot}} &
> +          \multicolumn{1}{c}{\textbf{-{}-build}} \\
>            \midrule
> -          0, 1, 2, 3        & No  & No  & No  & No  & No  \\
> -          4                 & Yes & No  & No  & No  & No  \\
> -          5                 & Yes & Yes & No  & No  & No  \\
> -          6                 & Yes & Yes & Yes & Yes & No  \\
> -          7                 & Yes & Yes & Yes & Yes & Yes \\
> +          0, 1, 2, 3        & No  & No  & No  & No  & No  & No  \\
> +          4                 & Yes & No  & No  & No  & No  & No  \\
> +          5                 & Yes & Yes & No  & No  & No  & No  \\
> +          6                 & Yes & Yes & Yes & Yes & No  & No  \\
> +          7                 & Yes & Yes & Yes & Yes & Yes & Yes \\
>            \bottomrule
>          \end{tabular}
>      \end{centertable}

Otherwise LGTM.

Ulrich

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]