From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id Y8KcHVtkg2l9PSgAWB0awg (envelope-from ) for ; Wed, 04 Feb 2026 10:23:07 -0500 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=S6GPJN5w; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=hRPFmqBi; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=S6GPJN5w; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=hRPFmqBi; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 669591E0BA; Wed, 04 Feb 2026 10:23:07 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-1.6 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED,RDNS_NONE autolearn=no autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (unknown [38.145.34.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 7A2BC1E08D for ; Wed, 04 Feb 2026 10:23:06 -0500 (EST) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id EB0D14BA2E15 for ; Wed, 4 Feb 2026 15:23:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EB0D14BA2E15 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=S6GPJN5w; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=hRPFmqBi; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=S6GPJN5w; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=hRPFmqBi Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id 5C4C14BA2E0B for ; Wed, 4 Feb 2026 15:22:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5C4C14BA2E0B Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5C4C14BA2E0B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1770218558; cv=none; b=cMPKRvmSJ+F4mlQIlAiNzBizauJFWL2STHJi1oV2BSJrC9xwhzX4UafyTlZTv6oONAk2aHF3LOlQ+L8macZTE2nDWlbpPlTANFqI9dZ2fe04EyWXyatPqPhWzV+YlNxfax0uH7/W9SzihTzja7yuvlBKnYOECXdtNiy/w9ddHwk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1770218558; c=relaxed/simple; bh=r+gHPE20/9wYhbIi2+1+fEI51v7EllVcAvt5B5xp1BQ=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=kXIQE4FO2zQYOO4n++e+OzGNRhxyYhbBOl8/f2zlnt70y0sKeQhBE9N4An60UD4fmtvP7qt1ukhhrW6iCgAABxZtCsfBtRUstr8oLUiLQb80pVIQBqfMaEpvuq3nmooHN8AMgBYzLU97yIMpSP6M3Z2DwRFfJvx9n5qNKOPgoQo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5C4C14BA2E0B Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 44E675BD41 for ; Wed, 4 Feb 2026 15:22:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1770218557; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=IYV/F7b8TPH8mmdHFbi3nvfM0LsIVAhDegTzmls4PWA=; b=S6GPJN5wFrLZI7QK1v13hW3TIgsdh1oKNGwVboaJs8D1NXPGe+E9cXwqwLGHaUTeZ9w0J5 R/QrqBg1uLAnNvtJvXV7af4w8D7c+MdUQtGCYAx1ZYzXTBrz/Gs0T3fPqDNL8p9wU+ypvZ VGg9VMEyNy0xM91/x7+MUgTFrMmd9fE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1770218557; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=IYV/F7b8TPH8mmdHFbi3nvfM0LsIVAhDegTzmls4PWA=; b=hRPFmqBi+nnR/AhwmH5uKijtPL8kLAA7Et6cxdWCpr+SQulYIxWBkebEEq0Vpw/eXrc8rp KClpFt2SqP9iTTDg== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1770218557; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=IYV/F7b8TPH8mmdHFbi3nvfM0LsIVAhDegTzmls4PWA=; b=S6GPJN5wFrLZI7QK1v13hW3TIgsdh1oKNGwVboaJs8D1NXPGe+E9cXwqwLGHaUTeZ9w0J5 R/QrqBg1uLAnNvtJvXV7af4w8D7c+MdUQtGCYAx1ZYzXTBrz/Gs0T3fPqDNL8p9wU+ypvZ VGg9VMEyNy0xM91/x7+MUgTFrMmd9fE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1770218557; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=IYV/F7b8TPH8mmdHFbi3nvfM0LsIVAhDegTzmls4PWA=; b=hRPFmqBi+nnR/AhwmH5uKijtPL8kLAA7Et6cxdWCpr+SQulYIxWBkebEEq0Vpw/eXrc8rp KClpFt2SqP9iTTDg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 259513EA63 for ; Wed, 4 Feb 2026 15:22:37 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id OjfnBz1kg2lOKgAAD6G6ig (envelope-from ) for ; Wed, 04 Feb 2026 15:22:37 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v2] [gdb/build] Require makeinfo 5.0 Date: Wed, 4 Feb 2026 16:22:36 +0100 Message-ID: <20260204152236.3546595-1-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; FUZZY_RATELIMITED(0.00)[rspamd.com]; ARC_NA(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; TO_DN_NONE(0.00)[]; FROM_HAS_DN(0.00)[] X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org Building GDB documentation in the info format requires makeinfo 5.0 [1]. Bail out when trying to use an older makeinfo version. I tested this by requiring 7.0 in two setups that have respectively makeinfo 7.1 and 6.5. In the 7.1 case I got (make output): ... makeinfo-wrapper.sh 7 0 makeinfo ... -o gdb.info gdb/doc/gdb.texinfo makeinfo-wrapper.sh 7 0 makeinfo ... -o annotate.info gdb/doc/annotate.texinfo rluser.texi:2: warning: @setfilename after the first element ... and in the 6.5 case I got instead: ... makeinfo-wrapper.sh 7 0 makeinfo ... -o gdb.info gdb/doc/gdb.texinfo makeinfo-wrapper.sh 7 0 makeinfo ... -o annotate.info gdb/doc/annotate.texinfo makeinfo is too old, have 6.5, require 7.0. Info documentation will not be build. makeinfo is too old, have 6.5, require 7.0. Info documentation will not be build. ... Checked new file gdb/doc/makeinfo-wrapper.sh with shellcheck. Changes in v2: - handle version line 'texi2any (GNU texinfo) 7.2.90+nc' Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=33870 --- gdb/doc/Makefile.in | 4 +++- gdb/doc/makeinfo-wrapper.sh | 44 +++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100755 gdb/doc/makeinfo-wrapper.sh diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in index 05548aab5f6..09afc86de2f 100644 --- a/gdb/doc/Makefile.in +++ b/gdb/doc/Makefile.in @@ -58,7 +58,9 @@ TEXIDIR=${gdbdir}/../texinfo MAKEINFO = @MAKEINFO@ MAKEINFOFLAGS = @MAKEINFOFLAGS@ MAKEINFO_EXTRA_FLAGS = @MAKEINFO_EXTRA_FLAGS@ -MAKEINFO_CMD = $(MAKEINFO) $(MAKEINFOFLAGS) $(MAKEINFO_EXTRA_FLAGS) +# Check required makeinfo version in makeinfo-wrapper.sh. +MAKEINFO_CMD = $(srcdir)/makeinfo-wrapper.sh 5 0 $(MAKEINFO) \ + $(MAKEINFOFLAGS) $(MAKEINFO_EXTRA_FLAGS) MAKEHTML = $(MAKEINFO_CMD) --html MAKEHTMLFLAGS = diff --git a/gdb/doc/makeinfo-wrapper.sh b/gdb/doc/makeinfo-wrapper.sh new file mode 100755 index 00000000000..6123d60dfc7 --- /dev/null +++ b/gdb/doc/makeinfo-wrapper.sh @@ -0,0 +1,44 @@ +#!/bin/sh + +# Copyright (C) 2026 Free Software Foundation, Inc. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Wrapper around makeinfo to check makeinfo version. + +required_major="$1" +required_minor="$2" +prog="$3" + +shift 3 + +major=$("$prog" --version \ + | grep "GNU texinfo" \ + | sed 's/^.* \([0-9][0-9]*\)\.[0-9][0-9]*\(\..*\)\?$/\1/') +minor=$("$prog" --version \ + | grep "GNU texinfo" \ + | sed 's/^.* [0-9][0-9]*\.\([0-9][0-9]*\)\(\..*\)\?$/\1/') + +if [ "$major" = "" ] || [ "$major" = "" ]; then + echo "Cannot determine makeinfo version for $prog. Info documentation will not be build." + exit +fi + +if [ "$major" -lt "$required_major" ] \ + || { [ "$major" -eq "$required_major" ] \ + && [ "$minor" -lt "$required_minor" ]; }; then + echo "$prog is too old, have $major.$minor, require $required_major.$required_minor. Info documentation will not be build." + exit +fi + +exec "$prog" "$@" base-commit: 2eba2726b3f57be086bca44c5694b9faf9396cef -- 2.51.0