From patchwork Wed Nov 9 09:09:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Li=C5=A1ka?= X-Patchwork-Id: 60258 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 665EB38438AB for ; Wed, 9 Nov 2022 09:09:54 +0000 (GMT) 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 877703857C51; Wed, 9 Nov 2022 09:09:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 877703857C51 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.cz 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 6B1AF1F8EE; Wed, 9 Nov 2022 09:09:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1667984968; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9rUQ4K3lUHjSkeX7qViUxU8CyD7w7PHFeLaMaSyY6AQ=; b=3NGAIaFKROwDdh4o0f4N0y76jaJHKUbdQsUwMokXKYgn5B6n7HXd0YDViYjfmeZE5s0aX6 lkntxsZsklVsvY+23uaYDWTj1BlJOrzj9XSM9QMgCOUGDgGuVRfVbXw4h0w702LhKPqYtW WQauwBy8Qxq/4VeJ/fV1vlUK0ELLQrM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1667984968; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9rUQ4K3lUHjSkeX7qViUxU8CyD7w7PHFeLaMaSyY6AQ=; b=2Bd71CAmiaOdqPXR7QKJt0FnShVNAZhreHZw4TCxc90zwjSoOJNV/lmaxfN0tgZt5xZZJz HBMLe/V/PTN5POBw== 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 52EF31331F; Wed, 9 Nov 2022 09:09:28 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id sfqaEkhua2OtaQAAMHmgww (envelope-from ); Wed, 09 Nov 2022 09:09:28 +0000 Message-ID: <75c37723-6963-db1a-0eb3-d71e16aecd7b@suse.cz> Date: Wed, 9 Nov 2022 10:09:27 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 From: =?utf-8?q?Martin_Li=C5=A1ka?= Subject: [PATCH (pushed)] sphinx: fix building if sphinx-build is missing To: gcc-patches@gcc.gnu.org Content-Language: en-US Cc: jsm28@gcc.gnu.org X-Spam-Status: No, score=-11.9 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: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" I noticed I modified Makefile.in files in the Sphinx series. While I was supposed to modifiky Makefile.am and use automake. I'm going to fix that soon. Martin libgomp/ChangeLog: * Makefile.in: Build info pages conditionally. libitm/ChangeLog: * Makefile.in: Build info pages conditionally. libquadmath/ChangeLog: * Makefile.in: Build info pages conditionally. --- libgomp/Makefile.in | 5 ++++- libitm/Makefile.in | 5 ++++- libquadmath/Makefile.in | 4 +++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in index 9d1787d8458..0c016980c3d 100644 --- a/libgomp/Makefile.in +++ b/libgomp/Makefile.in @@ -1304,7 +1304,10 @@ stamp-geninsrc: doc/info/texinfo/libgomp.info @touch $@ doc/info/texinfo/libgomp.info: $(SPHINX_FILES) - + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/info SPHINXBUILD=$(SPHINX_BUILD) + + if [ x$(HAS_SPHINX_BUILD) = xhas-sphinx-build ]; then \ + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/info SPHINXBUILD=$(SPHINX_BUILD); \ + else true; fi + # target overrides -include $(tmake_file) diff --git a/libitm/Makefile.in b/libitm/Makefile.in index 38a7e5bf731..f51858db8c7 100644 --- a/libitm/Makefile.in +++ b/libitm/Makefile.in @@ -1121,7 +1121,10 @@ stamp-geninsrc: doc/info/texinfo/libitm.info @touch $@ doc/info/texinfo/libitm.info: $(SPHINX_FILES) - + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/info SPHINXBUILD=$(SPHINX_BUILD) + + if [ x$(HAS_SPHINX_BUILD) = xhas-sphinx-build ]; then \ + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/info SPHINXBUILD=$(SPHINX_BUILD); \ + else true; fi + # GNU Make needs to see an explicit $(MAKE) variable in the command it # runs to enable its job server during parallel builds. Hence the diff --git a/libquadmath/Makefile.in b/libquadmath/Makefile.in index d551f56ce62..864ebc6048a 100644 --- a/libquadmath/Makefile.in +++ b/libquadmath/Makefile.in @@ -1374,7 +1374,9 @@ SPHINX_FILES:=$(RST_FILES) $(SPHINX_CONFIG_FILES) export BUGURL=$(REPORT_BUGS_TO) doc/info/texinfo/libquadmath.info: $(SPHINX_FILES) - + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/info SPHINXBUILD=$(SPHINX_BUILD) + + if [ x$(HAS_SPHINX_BUILD) = xhas-sphinx-build ]; then \ + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/info SPHINXBUILD=$(SPHINX_BUILD); \ + else true; fi # GNU Make needs to see an explicit $(MAKE) variable in the command it # runs to enable its job server during parallel builds. Hence the