From patchwork Tue Oct 4 15:21:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 58340 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 2116D3858288 for ; Tue, 4 Oct 2022 15:22:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2116D3858288 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1664896931; bh=RqG7drp7eUPHKCS6U/IvZ6sdVaBlEK1J1SfHcxLZHm8=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=yWXApg+j88Kt6XZUS1vJmR5w+Aq1HAB5Ih9R9yryLhJGj0zdOlVTJ68ZcHdRiOej/ HfA0BSE7pdUqa80lh7ns55/OJ051KixBDZ9luIFE4ztkja1km9NmskvL0D3wlUBo48 YFNSWM5fW0/6CcDDdgcXcapZDthWg0flOc6TG74o= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 9D1143858CDA for ; Tue, 4 Oct 2022 15:21:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9D1143858CDA Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 54BCC1F945 for ; Tue, 4 Oct 2022 15:21:35 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 41EBD139EF for ; Tue, 4 Oct 2022 15:21:35 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 1+n5Dn9PPGODDwAAMHmgww (envelope-from ) for ; Tue, 04 Oct 2022 15:21:35 +0000 Date: Tue, 4 Oct 2022 17:21:33 +0200 To: gcc-patches@gcc.gnu.org Subject: [PATCH] Add --without-makeinfo Message-ID: <20221004152132.GA1906@delia.home> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, 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: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tom de Vries via Gcc-patches From: Tom de Vries Reply-To: Tom de Vries Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Hi, Currently, we cannot build gdb without makeinfo installed. It would be convenient to work around this by using the configure flag MAKEINFO=/usr/bin/true or some such, but that doesn't work because top-level configure requires a makeinfo of at least version 4.7, and that version check fails for /usr/bin/true, so we end up with MAKEINFO=missing instead. What does work is this: ... $ ./configure $ make MAKEINFO=/usr/bin/true ... but the drawback is that it'll have to be specified for each make invocation. Fix this by adding support for --without-makeinfo in top-level configure. Tested by building gdb on x86_64-linux, and verifying that no .info files were generated. OK for trunk? Thanks, - Tom Add --without-makeinfo ChangeLog: 2022-09-05 Tom de Vries * configure.ac: Add --without-makeinfo. * configure: Regenerate. --- configure | 4 ++++ configure.ac | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/configure b/configure index f14e0efd675..eb84add60cb 100755 --- a/configure +++ b/configure @@ -8399,6 +8399,9 @@ fi done test -n "$MAKEINFO" || MAKEINFO="$MISSING makeinfo" +if test $with_makeinfo = "no"; then +MAKEINFO=true +else case " $build_configdirs " in *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;; *) @@ -8414,6 +8417,7 @@ case " $build_configdirs " in ;; esac +fi # FIXME: expect and dejagnu may become build tools? diff --git a/configure.ac b/configure.ac index 0152c69292e..e4a2c076674 100644 --- a/configure.ac +++ b/configure.ac @@ -3441,6 +3441,9 @@ case " $build_configdirs " in esac AC_CHECK_PROGS([MAKEINFO], makeinfo, [$MISSING makeinfo]) +if test $with_makeinfo = "no"; then +MAKEINFO=true +else case " $build_configdirs " in *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;; *) @@ -3456,6 +3459,7 @@ changequote(,) ;; changequote([,]) esac +fi # FIXME: expect and dejagnu may become build tools?