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: Update condition for econf --disable-static (again)
Date: Sat, 19 Nov 2022 20:37:25
Message-Id: 20221119203709.24307-1-ulm@gentoo.org
1 The intention is to pass --disable-static, in order to (only) disable
2 static libtool archive building. The current condition asks for either
3 of --{disable,enable}-static in configure --help output, which causes
4 false positives:
5 https://archives.gentoo.org/gentoo-portage-dev/message/efc3f424d1dffd3415da538ec25532a9
6
7 Therefore, narrow the condition to require both --enable-static and
8 --enable-shared. In addition, backport the check for proper end of
9 string from the EAPI 9 feature list, but restrict it to this option
10 for now.
11
12 Bug: https://bugs.gentoo.org/814368
13 Bug: https://bugs.gentoo.org/815169
14 Signed-off-by: Ulrich Müller <ulm@g.o>
15 ---
16 pkg-mgr-commands.tex | 5 +++--
17 1 file changed, 3 insertions(+), 2 deletions(-)
18
19 diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex
20 index d4dcffe..a3e8a41 100644
21 --- a/pkg-mgr-commands.tex
22 +++ b/pkg-mgr-commands.tex
23 @@ -341,8 +341,9 @@ commands once the current phase function has returned.
24 as using it. This option will only be passed if the string \t{-{}-disable-silent-rules}
25 occurs in the output of \t{configure -{}-help}.
26 \item \t{-{}-disable-static}, if the EAPI is listed in table~\ref{tab:econf-options-table}
27 - as using it. This option will only be passed if the string \t{-{}-disable-static} or
28 - \t{-{}-enable-static} occurs in the output of \t{configure -{}-help}.
29 + as using it. This option will only be passed if both strings \t{-{}-enable-static} and
30 + \t{-{}-enable-shared} occur in the output of \t{configure -{}-help}, and if neither of them
31 + is immediately followed by any of the characters \t{[A-Za-z0-9+_.-]}.
32 \end{itemize}
33
34 \ChangeWhenAddingAnEAPI{8}
35 --
36 2.38.1