[gentoo-pms] [PATCH] EAPI 6: get_libdir

[gentoo-pms] [PATCH] EAPI 6: get_libdir

[Michał Górny]

---
 eapi-differences.tex |  5 ++++-
 pkg-mgr-commands.tex | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/eapi-differences.tex b/eapi-differences.tex
index 6a7aa00..abfb663 100644
--- a/eapi-differences.tex
+++ b/eapi-differences.tex
@@ -201,6 +201,9 @@ Controllable compression & \compactfeatureref{docompress} &
 File mtimes preserved & \compactfeatureref{mtime-preserve} &
     Undefined & Yes & Yes & Yes & Yes \\
 
+\t{get\_libdir} & \compactfeatureref{get-libdir} &
+	No & No & No & No & Yes \\
+
 \end{longtable}
 \end{landscape}
 
@@ -304,7 +307,7 @@ EAPI 5 is EAPI 4 with the following changes:
 EAPI 6 is EAPI 5 with the following changes:
 
 \begin{compactitem}
-\item None
+\item \t{get\_libdir} support, \featureref{get-libdir}.
 \end{compactitem}
 
 \ChangeWhenAddingAnEAPI{6}
diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex
index 929d0fe..aa4b7b3 100644
--- a/pkg-mgr-commands.tex
+++ b/pkg-mgr-commands.tex
@@ -94,8 +94,42 @@ to the host root instead of \t{ROOT}.
 \item[best\_version] Takes exactly one package dependency specification as an argument. If a
     matching package is installed, prints the category, package name and version of the highest
     matching version; otherwise, prints an empty string. The exit code is unspecified.
+\item[get\_libdir] \featurelabel{get-libdir}
+	Prints the libdir name obtained according to Algorithm~\ref{alg:get-libdir}.
+	Only available in EAPIs listed in table~\ref{tab:get-libdir-table} as supporting \t{get\_libdir}.
 \end{description}
 
+\begin{algorithm}
+\caption{get\_libdir logic} \label{alg:get-libdir}
+\begin{algorithmic}[1]
+\STATE let libdir=lib
+\IF{the ABI environment variable is set}
+    \STATE let libvar=LIBDIR\_\$ABI
+    \IF{the environment variable named by libvar is set}
+        \STATE let libdir=the value of the variable named by libvar
+    \ENDIF
+\ENDIF
+\STATE print the value of libdir
+\end{algorithmic}
+\end{algorithm}
+\ChangeWhenAddingAnEAPI{6}
+\begin{centertable}{EAPIs supporting \t{get\_libdir}} \label{tab:get-libdir-table}
+    \begin{tabular}{ l l }
+        \toprule
+            \multicolumn{1}{c}{\textbf{EAPI}} &
+            \multicolumn{1}{c}{\textbf{Supports \t{get\_libdir}?}} \\
+            \midrule
+    \t{0} & No \\
+    \t{1} & No \\
+    \t{2} & No \\
+    \t{3} & No \\
+    \t{4} & No \\
+    \t{5} & No \\
+    \t{6} & Yes \\
+    \bottomrule
+    \end{tabular}
+\end{centertable}
+
 \subsubsection{Output commands}
 These commands display messages to the user. Unless otherwise stated, the entire argument list is
 used as a message, with backslash-escaped characters interpreted as for the \t{echo -e} command of
-- 
2.3.0

Re: [gentoo-pms] [PATCH] EAPI 6: get_libdir

[Ciaran McCreesh]

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

On Sun, 15 Feb 2015 23:12:34 +0100
Michał Górny <mgorny@gentoo.org> wrote:
> +\item \t{get\_libdir} support, \featureref{get-libdir}.

What's the deal with get_libdir, these days? It used to be defined by
Portage, but then overridden in different ways in different places,
leading to horrible confusion...

And if a sane version is being specified, perhaps it should have a
different name, to avoid confusion.

-- 
Ciaran McCreesh

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: [gentoo-pms] [PATCH] EAPI 6: get_libdir

[Michał Górny]

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

Dnia 2015-02-15, o godz. 22:18:19
Ciaran McCreesh <ciaran.mccreesh@googlemail.com> napisał(a):

> On Sun, 15 Feb 2015 23:12:34 +0100
> Michał Górny <mgorny@gentoo.org> wrote:
> > +\item \t{get\_libdir} support, \featureref{get-libdir}.
> 
> What's the deal with get_libdir, these days? It used to be defined by
> Portage, but then overridden in different ways in different places,
> leading to horrible confusion...
> 
> And if a sane version is being specified, perhaps it should have a
> different name, to avoid confusion.

Portage didn't define it in any recent versions. Multilib.eclass used
to, and the algorithm was already defined for econf, so true get_libdir
is good for consistency.

-- 
Best regards,
Michał Górny

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 949 bytes --]

Re: [gentoo-pms] [PATCH] EAPI 6: get_libdir

[Ulrich Mueller]

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

>>>>> On Sun, 15 Feb 2015, Michał Górny wrote:

> --- a/pkg-mgr-commands.tex
> +++ b/pkg-mgr-commands.tex
> @@ -94,8 +94,42 @@ to the host root instead of \t{ROOT}.
>  \item[best\_version] Takes exactly one package dependency specification as an argument. If a
>      matching package is installed, prints the category, package name and version of the highest
>      matching version; otherwise, prints an empty string. The exit code is unspecified.
> +\item[get\_libdir] \featurelabel{get-libdir}
> +	Prints the libdir name obtained according to Algorithm~\ref{alg:get-libdir}.
> +	Only available in EAPIs listed in table~\ref{tab:get-libdir-table} as supporting \t{get\_libdir}.
>  \end{description}

"Package manager query commands" doesn't look like the right section
for this. I rather add it to "Misc commands", or to the same section
as the econf command.

Ulrich

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

[gentoo-pms] [PATCH] EAPI 6: get_libdir

[Michał Górny]

---
Moved to misc commands
---
 eapi-differences.tex |  5 ++++-
 pkg-mgr-commands.tex | 37 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/eapi-differences.tex b/eapi-differences.tex
index 6a7aa00..abfb663 100644
--- a/eapi-differences.tex
+++ b/eapi-differences.tex
@@ -201,6 +201,9 @@ Controllable compression & \compactfeatureref{docompress} &
 File mtimes preserved & \compactfeatureref{mtime-preserve} &
     Undefined & Yes & Yes & Yes & Yes \\
 
+\t{get\_libdir} & \compactfeatureref{get-libdir} &
+	No & No & No & No & Yes \\
+
 \end{longtable}
 \end{landscape}
 
@@ -304,7 +307,7 @@ EAPI 5 is EAPI 4 with the following changes:
 EAPI 6 is EAPI 5 with the following changes:
 
 \begin{compactitem}
-\item None
+\item \t{get\_libdir} support, \featureref{get-libdir}.
 \end{compactitem}
 
 \ChangeWhenAddingAnEAPI{6}
diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex
index 929d0fe..a00350e 100644
--- a/pkg-mgr-commands.tex
+++ b/pkg-mgr-commands.tex
@@ -834,7 +834,6 @@ has returned.
     section~\ref{sec:default-phase-funcs}).  Must not be called if the \t{default\_} function
     does not exist for the current phase in the current EAPI.  Only available in EAPIs listed in
     table~\ref{tab:default-function-table}.
-\end{description}
 
 \ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{EAPIs supporting the \t{default} function} \label{tab:default-function-table}
@@ -854,6 +853,42 @@ has returned.
     \end{tabular}
 \end{centertable}
 
+\item[get\_libdir] \featurelabel{get-libdir}
+	Prints the libdir name obtained according to Algorithm~\ref{alg:get-libdir}.
+	Only available in EAPIs listed in table~\ref{tab:get-libdir-table} as supporting \t{get\_libdir}.
+\end{description}
+
+\begin{algorithm}
+\caption{get\_libdir logic} \label{alg:get-libdir}
+\begin{algorithmic}[1]
+\STATE let libdir=lib
+\IF{the ABI environment variable is set}
+    \STATE let libvar=LIBDIR\_\$ABI
+    \IF{the environment variable named by libvar is set}
+        \STATE let libdir=the value of the variable named by libvar
+    \ENDIF
+\ENDIF
+\STATE print the value of libdir
+\end{algorithmic}
+\end{algorithm}
+\ChangeWhenAddingAnEAPI{6}
+\begin{centertable}{EAPIs supporting \t{get\_libdir}} \label{tab:get-libdir-table}
+    \begin{tabular}{ l l }
+        \toprule
+            \multicolumn{1}{c}{\textbf{EAPI}} &
+            \multicolumn{1}{c}{\textbf{Supports \t{get\_libdir}?}} \\
+            \midrule
+    \t{0} & No \\
+    \t{1} & No \\
+    \t{2} & No \\
+    \t{3} & No \\
+    \t{4} & No \\
+    \t{5} & No \\
+    \t{6} & Yes \\
+    \bottomrule
+    \end{tabular}
+\end{centertable}
+
 \subsubsection{Debug Commands}
 The following commands are available for debugging. Normally all of these commands should be no ops;
 a package manager may provide a special debug mode where these commands instead do something.
-- 
2.3.0

Re: [gentoo-pms] [PATCH] EAPI 6: get_libdir

[Ulrich Mueller]

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

Committed to eapi-6 branch.

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