From: Enze Li <enze.li@hotmail.com>
To: binutils@sourceware.org
Cc: gdb-patches@sourceware.org, enze.li@gmx.com, eliz@gnu.org,
schwab@linux-m68k.org
Subject: [PATCH v2] libctf: update regexp to allow makeinfo to build document
Date: Sat, 14 Jan 2023 12:23:26 +0800 [thread overview]
Message-ID: <OS3P286MB2152CCD151694D02E2A84D23F0C39@OS3P286MB2152.JPNP286.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <OS3P286MB2152AC3F96A88680022D57ADF0C29@OS3P286MB2152.JPNP286.PROD.OUTLOOK.COM>
While trying to build gdb on latest openSUSE Tumbleweed, I noticed the
following warning,
checking for makeinfo... makeinfo --split-size=5000000
configure: WARNING:
*** Makeinfo is too old. Info documentation will not be built.
then I checked the version of makeinfo, it said,
======
$ makeinfo --version
texi2any (GNU texinfo) 7.0.1
Copyright (C) 2022 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
======
After digging a little bit, it became quite obvious that a dot is
missing in regexp that makes it impossible to match versions higher than
7.0, and here's the solution:
- | egrep 'texinfo[^0-9]*(6\.[3-9]|[7-9][0-9])' >/dev/null 2>&1; then
+ | egrep 'texinfo[^0-9]*(6\.[3-9]|[7-9]\.[0-9])' >/dev/null 2>&1; then
However, Eli pointed out that the solution above has another problem: it
will stop working when Texinfo 10.1 will be released. Meanwhile, he
suggested to solve this problem permanently. That is, we don't care
about the minor version for Texinfo > 6.9, we only care about the major
version.
In this way, problem solved permanently, thanks to Eli.
libctf/ChangeLog:
* configure: Regenerated.
* configure.ac: Update regexp to match versions higher than 7.0.
---
libctf/configure | 2 +-
libctf/configure.ac | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libctf/configure b/libctf/configure
index c22f7dffd2c..a0e40f49a80 100755
--- a/libctf/configure
+++ b/libctf/configure
@@ -14864,7 +14864,7 @@ esac
# We require texinfo to be 6.3 or later, for a working synindex
# and validatemenus: otherwise we fall back to /bin/true.
if ${MAKEINFO} --version \
- | egrep 'texinfo[^0-9]*(6\.[3-9]|[7-9][0-9])' >/dev/null 2>&1; then
+ | egrep 'texinfo[^0-9]*(6\.[3-9]|[7-9]|[1-6][0-9])' >/dev/null 2>&1; then
build_info=yes
else
build_info=
diff --git a/libctf/configure.ac b/libctf/configure.ac
index 1d0cf4d0fa5..6a5eade1855 100644
--- a/libctf/configure.ac
+++ b/libctf/configure.ac
@@ -184,7 +184,7 @@ changequote(,)
# We require texinfo to be 6.3 or later, for a working synindex
# and validatemenus: otherwise we fall back to /bin/true.
if ${MAKEINFO} --version \
- | egrep 'texinfo[^0-9]*(6\.[3-9]|[7-9][0-9])' >/dev/null 2>&1; then
+ | egrep 'texinfo[^0-9]*(6\.[3-9]|[7-9]|[1-6][0-9])' >/dev/null 2>&1; then
build_info=yes
else
build_info=
base-commit: dd19001ff621dbdaddadf71d3b4984ea016fd153
--
2.39.0
next prev parent reply other threads:[~2023-01-14 4:24 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-13 14:42 [PATCH] " Enze Li
2023-01-13 15:05 ` Eli Zaretskii
2023-01-13 15:36 ` Andreas Schwab
2023-01-13 15:44 ` Eli Zaretskii
2023-01-14 4:36 ` Enze Li
2023-01-14 7:36 ` Eli Zaretskii
2023-01-14 4:23 ` Enze Li [this message]
2023-01-16 13:51 ` [PATCH v2] " Nick Alcock
2023-01-16 15:19 ` Enze Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=OS3P286MB2152CCD151694D02E2A84D23F0C39@OS3P286MB2152.JPNP286.PROD.OUTLOOK.COM \
--to=enze.li@hotmail.com \
--cc=binutils@sourceware.org \
--cc=eliz@gnu.org \
--cc=enze.li@gmx.com \
--cc=gdb-patches@sourceware.org \
--cc=schwab@linux-m68k.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).