From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7872) id 04B583858CDB; Mon, 16 Jan 2023 15:24:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 04B583858CDB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673882665; bh=tsW6P5hztyoSIPuvDXmdQ2r11uSc7YFoXOz3hQZpP8U=; h=From:To:Subject:Date:From; b=RWR8sk6kpHe6gAzWnq2h8ow7E/FuoXqp8CSwBVigdy/X+lm8ikXWq2bYBkF0soala 9qumYeUIGgHvkyI7PewB/s+WMVuczqfzms01fBpmrPZN5TksFRIeJ/35xw+VZeTe29 ktcGRqhBqT8wR0mkUva9fpHHLUsi6eD4FcEEDUco= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Enze Li To: bfd-cvs@sourceware.org, gdb-cvs@sourceware.org Subject: [binutils-gdb/binutils-2_40-branch] libctf: update regexp to allow makeinfo to build document X-Act-Checkin: binutils-gdb X-Git-Author: Enze Li X-Git-Refname: refs/heads/binutils-2_40-branch X-Git-Oldrev: 36795a207d1a6788df21303ba694d3dc3ca294f8 X-Git-Newrev: f7c5db99b76e8dde89335d794c82fcbfbf53c612 Message-Id: <20230116152425.04B583858CDB@sourceware.org> Date: Mon, 16 Jan 2023 15:24:25 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Df7c5db99b76e= 8dde89335d794c82fcbfbf53c612 commit f7c5db99b76e8dde89335d794c82fcbfbf53c612 Author: Enze Li Date: Sat Jan 14 11:33:48 2023 +0800 libctf: update regexp to allow makeinfo to build document =20 While trying to build gdb on latest openSUSE Tumbleweed, I noticed the following warning, =20 checking for makeinfo... makeinfo --split-size=3D5000000 configure: WARNING: *** Makeinfo is too old. Info documentation will not be built. =20 then I checked the version of makeinfo, it said, =3D=3D=3D=3D=3D=3D $ makeinfo --version texi2any (GNU texinfo) 7.0.1 =20 Copyright (C) 2022 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. =3D=3D=3D=3D=3D=3D =20 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: =20 - | 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 =20 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. =20 In this way, the problem will be resolved permanently, thanks to Eli. =20 libctf/ChangeLog: =20 * configure: Regenerated. * configure.ac: Update regexp to match versions higher than 7.0. Diff: --- libctf/configure | 2 +- libctf/configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libctf/configure b/libctf/configure index 17463a74cca..b347b292195 100755 --- a/libctf/configure +++ b/libctf/configure @@ -14865,7 +14865,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=3Dyes else build_info=3D diff --git a/libctf/configure.ac b/libctf/configure.ac index a0148a4c328..47216ccf9fc 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=3Dyes else build_info=3D