Gentoo Archives: gentoo-pms

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-pms@l.g.o
Cc: "Ulrich Müller" <ulm@g.o>
Subject: [gentoo-pms] [PATCH] pkg-mgr-commands.tex: Fix econf --libdir logic
Date: Wed, 04 Aug 2021 17:28:51
Message-Id: 20210804172830.9571-1-ulm@gentoo.org
1 Portage uses both --exec-prefix and --prefix in its econf logic,
2 introduced in 2005:
3 https://gitweb.gentoo.org/archive/proj/portage-cvs.git/commit/?h=portage_2_0&id=865508e5cb2fd3e6ef7c312b6a7bb88cf8799f9c
4
5 Pkgcore agrees with Portage.
6
7 Paludis uses --prefix first, then --exec-prefix.
8
9 Closes: https://bugs.gentoo.org/806374
10 Signed-off-by: Ulrich Müller <ulm@g.o>
11 ---
12 pkg-mgr-commands.tex | 4 +++-
13 1 file changed, 3 insertions(+), 1 deletion(-)
14
15 diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex
16 index 0a34db9..4431435 100644
17 --- a/pkg-mgr-commands.tex
18 +++ b/pkg-mgr-commands.tex
19 @@ -386,7 +386,9 @@ commands once the current phase function has returned.
20 \caption{\t{econf -{}-libdir} logic} \label{alg:econf-libdir}
21 \begin{algorithmic}[1]
22 \STATE let prefix=\$\{EPREFIX\}/usr
23 -\IF{the caller specified -{}-prefix=\$p}
24 +\IF{the caller specified -{}-exec-prefix=\$ep}
25 + \STATE let prefix=\$ep
26 +\ELSIF{the caller specified -{}-prefix=\$p}
27 \STATE let prefix=\$p
28 \ENDIF
29 \STATE let libdir=
30 --
31 2.32.0