summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2022-11-19 21:22:34 +0100
committerUlrich Müller <ulm@gentoo.org>2022-11-19 21:22:34 +0100
commite0aa80cc0d28a25bfc68b4671771083e282f6ba2 (patch)
treee89fa250d8a68fade1687bf1016b00584c6b247c
parentebuild-format.tex: Document that umask is set to 022 (diff)
downloadpms-e0aa80cc0d28a25bfc68b4671771083e282f6ba2.tar.gz
pms-e0aa80cc0d28a25bfc68b4671771083e282f6ba2.tar.bz2
pms-e0aa80cc0d28a25bfc68b4671771083e282f6ba2.zip
pkg-mgr-commands.tex: Update condition for econf --disable-static (again)
The intention is to pass --disable-static, in order to (only) disable static libtool archive building. The current condition asks for either of --{disable,enable}-static in configure --help output, which causes false positives: https://archives.gentoo.org/gentoo-portage-dev/message/efc3f424d1dffd3415da538ec25532a9 Therefore, narrow the condition to require both --enable-static and --enable-shared. In addition, backport the check for proper end of string from the EAPI 9 feature list, but restrict it to this option for now. Bug: https://bugs.gentoo.org/814368 Bug: https://bugs.gentoo.org/815169 Signed-off-by: Ulrich Müller <ulm@gentoo.org>
-rw-r--r--pkg-mgr-commands.tex5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex
index d4dcffe..a3e8a41 100644
--- a/pkg-mgr-commands.tex
+++ b/pkg-mgr-commands.tex
@@ -341,8 +341,9 @@ commands once the current phase function has returned.
as using it. This option will only be passed if the string \t{-{}-disable-silent-rules}
occurs in the output of \t{configure -{}-help}.
\item \t{-{}-disable-static}, 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{-{}-disable-static} or
- \t{-{}-enable-static} occurs in the output of \t{configure -{}-help}.
+ as using it. This option will only be passed if both strings \t{-{}-enable-static} and
+ \t{-{}-enable-shared} occur in the output of \t{configure -{}-help}, and if neither of them
+ is immediately followed by any of the characters \t{[A-Za-z0-9+_.-]}.
\end{itemize}
\ChangeWhenAddingAnEAPI{8}