From patchwork Sat Jan 14 04:23:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Enze Li X-Patchwork-Id: 63189 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D1C69383FB98 for ; Sat, 14 Jan 2023 04:25:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D1C69383FB98 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673670335; bh=MITFDZVC5IsA3s3VzbaQ45yJA9BHv+AfN176pEjILl8=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=pCDMFtuZuTna5fy0j4NUSESW1p9Tgn2eVFq5Tip4u7hYIsSLgASH+P37cr1Mkny+5 TuU1TPSqVDar4D2D7/c2AVzIKvJz1QEVMcuHxKPnBxDoz9l/DNx3HKiyIxHGld9yDT m+GPpEbb5jt4D2Z09qnaLkYHEeAxpR+p3u47ej04= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01olkn2077.outbound.protection.outlook.com [40.92.98.77]) by sourceware.org (Postfix) with ESMTPS id 7BBF63858C50; Sat, 14 Jan 2023 04:24:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7BBF63858C50 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hbPlIDVvuAummp3kc6uElCUI62Acm3Nu2KYppSzg6kMsS1nbi7hkEBXLzF3Th8o+VwcwVzeVMvPv3BpqGneoq2N4WPTxN/RZ8JQg/7mx/CWM2OHm+FuURgz1B4TOl6n5wZd1Tr+byxtVo/qd9x9cXRs3mkMTwVNiHXpRLyNy2FucQq5ZAyvdif/lavalSk+DfkXMGyS6LdT0uTWRUNJJAyDUHTID1c5wXpi/ws419tItd/4hpL7Tq87wABzLHWwgBINTHXZAPA79ycvHb1gs8GqOter5sv2b+KXSe52cIg6+MSTrYc0VzTkYAuI2XZXaz5zw/AofvSHxj/0olvkDbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=MITFDZVC5IsA3s3VzbaQ45yJA9BHv+AfN176pEjILl8=; b=VWNjOAg7QiAQfHXAdqtsXjHzO/Pa31KMa2jAcv2w+PswgkArkNMZGYw5Kujvx21epaiDof3KS8tUaD8xyJPqq9GNtT/8fvgV/9xpm1EO2y5ocdOdSmBZt9irraVVpd6WXazetZ+bAEQ9Vxy+VfdEdRV0RSmnCHD/GuWZNBMnQ3V9TjabfuN2/RtcdXSHJceufilLZvWcNNybJBKIFNHAGoBIi7hLM7mTIhBW/TkBUh1dJUf8kYZ5gZLymvj18d6WgLmUhzzGGHdoZvdeixvrtAEh/P27Y8JKJsbNyHxPSKcilSIbGm2a6ShenZS1WNNg6KZp7lmQreh8QJ0/FzZNXw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from OS3P286MB2152.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:197::9) by TYWP286MB3285.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2d4::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.12; Sat, 14 Jan 2023 04:24:05 +0000 Received: from OS3P286MB2152.JPNP286.PROD.OUTLOOK.COM ([fe80::c90:199b:e178:3fa4]) by OS3P286MB2152.JPNP286.PROD.OUTLOOK.COM ([fe80::c90:199b:e178:3fa4%5]) with mapi id 15.20.6002.012; Sat, 14 Jan 2023 04:24:05 +0000 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 Message-ID: X-Mailer: git-send-email 2.39.0 In-Reply-To: References: X-TMN: [vNgau6c8wL6aJIANMocCH5GbB8QKjEqd] X-ClientProxiedBy: SG2PR03CA0110.apcprd03.prod.outlook.com (2603:1096:4:91::14) To OS3P286MB2152.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:197::9) X-Microsoft-Original-Message-ID: <20230114042326.32558-1-enze.li@hotmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3P286MB2152:EE_|TYWP286MB3285:EE_ X-MS-Office365-Filtering-Correlation-Id: 13da1112-3e51-44d8-4cc5-08daf5e72bf1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: n2onqWLV+F4vVFHb6uwY2I2FsTevTOLqNnvsaU03X3XSyvkTFPfppgbVg7GmFLRdo7RIgWeosjLHLIF0F4XO8MTgJt82fdAPXP8f5yFFobiLsqcZ8GClH40jFg5Gl894fLpi2c7LA2ZwYvpzq3lNxEaMxeEDdFfr7LRNpV9gAlwU5oISUh8hkZlH+Q0Bpeyemg6rJDMTCGqJQN9PIJLVSvve2zEO0z59g3sfhs9wUJiTR6FiGLaU+g/4xzU3CoWodFp6VWarfRDjpzk6kw7mZBhEjOMMJR2C2sm8asztBjoQAkJK+eRtuRYGhW/F0io7g/ONMQzYZyrkMh4bnjQYnYXQPBH6Iq2mtN43ALTDEzZMd9nj1oA/i5A1uFbdQoMAuIRUs9k4dMo3ZWwf4X03VxV8qx2U4dARzUBLIC0SmuU4prehqZJM2RGRFuWlt0KNvHfSKNEUbw4Y+gG5F6ihbPUeXQASLhqXpAbpjTQuJ2okKShBG/y/RxF/f0R7pYQDEVVGHfJv5Vqq4mFYH/Lh6Cs1uRdGnkSffnU/6jdGfOTVszGw0e+eisPPbsuTsNQlz050kN7Ye0s1NLIZ9C6ejg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xwZ3BuO81X4rcDIedYh47nG21SGG1C7tqHjxKfyZpY0NL+X7U33pcUQN3hhkyaPzE7Epr+MiKcGGit4znYOCKdk7LVq4qkLQhDqJC6PbpkKtlWDwR/ZTXnRoJx9Sn8l6xrPZgH3b27iPijHMRcKkHR3Vts+StVPw76ouahiPMgsiRu9Bl0/ZvDL4oOJKGvqNaqk+Imz/h1COV73udc7hZGqJsKAUYIT9hOVms/WlwzwTPQiW1IbZbH8Que/VHpF5r17E7BBv9UY2pc6JvVmg1B4boo647QtgTD5xuZngryHonKKsSXzYAAsn3e2pG9FOJXrkXqcs3Eke/wJR0lCcQUuQhzWGyLl0UrnxhHOYzVOlQMcwu3qT0ORjmbTmPEY0nffBCAAVwpoFC/Pzwe4d5MUJRcBzmUobMV+lOakyD0xXdFW2UwZlhLPJWe88gnSojwN3NQAL1Pt4Lw4XPrk6EFCeLpmJA65aiUv6GmuMVaJp97rRNy65K4BQBLNDtCt4DGuKCiLuqYlQ6pme9bPxGfwBcpr1532qDv50sZUUh6m4yE7ujHio+qpxDiKSHK2+/if1gylhSw3VjgV/CW65oPeIhj4NYEB/SOwiOE+MGf53cxZFH2YMSNJojjWpIrYzasIbwBDaNuLZq6kZXpgoHoQ6D4Oj1qtGjvsD/JvRNkI5XEkzZvECAO9Wycr8SZ+JdSfvO5ysPUFIS5sQ1c0IqQQW6umTj3MJB44R6LbSOR9zz86mRyUPGXjaGK27onV0htAl3182w7deOQjK83pU4Rt+iirz7a/AtdozcbdqkhHcas2zDfj/THR5RZLCHytUeYblkebdt1Msu9/mlzUuRJGIINeCcXp1bC+cb7f5u5edz9XlF+L1WIjZ3grZliftlp0/592V1v6ZeTJGDPIQvX+buAuLSr16QIe0Ez9aTY1yvK9S4gAFE1RVQTzSUJFzT+/CNPAhtFKJFXIqEaDcgaB5+qvUE/oVuFmZRRPXFb2GMwMKfsh4fcgkGg59UREBno8j7GidRR7c1bjI76RwiybOL5w1iyYceEcfnq+MgOdY3mi1dDVjlvqh3Od52D08yXD7nzRO7H5LMtsk/Ar1YCOuAnQKZHD7bVMNp08NGxei4nKpbGnQHIZNL8B+fUZLHpGY5OFZwRN2qFmG0Yh34QFWX/ehJsQfc0jTuv0MFZUfteusGjcKO1xITpJ2DliFHPAeCmiZkaP/wFCV2qZSRnrSCQT78IvBaFqcQFeAL66j/pd514SLQgbuLtiriKaTETDuxuB4Pmw+4X95sGiKpw== X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-05f45.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 13da1112-3e51-44d8-4cc5-08daf5e72bf1 X-MS-Exchange-CrossTenant-AuthSource: OS3P286MB2152.JPNP286.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2023 04:24:05.3736 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWP286MB3285 X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Enze Li via Gdb-patches From: Enze Li Reply-To: Enze Li Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" 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 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(-) base-commit: dd19001ff621dbdaddadf71d3b4984ea016fd153 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=