From patchwork Thu Mar 12 12:16:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Pan2 via Gcc-patches" X-Patchwork-Id: 1253530 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=Pp/bW4Jy; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (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 ozlabs.org (Postfix) with ESMTPS id 48dSW0373hz9sP7 for ; Thu, 12 Mar 2020 23:16:58 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B79E63945053; Thu, 12 Mar 2020 12:16:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B79E63945053 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1584015414; bh=T6ijlSNtjkmW/+FqkB6kHwYNxHD+0OsSJifHvy8Qpr8=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=Pp/bW4Jyr8XJTTFjlpip5dLOz+/NTj2RK4h0tf3mq+B5nSpNJ3JwqdacKm+kfbMzf eVAEgfz1+w2TeVxXhvzY4/jZ7vFl1AU6fHrS9CmcJm7KKIE9u2AcdYOFh3TVJKY8iy M8k5zn7E4gK8HER9JqE2VyUhNAZzUFn2NIVzZCIc= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by sourceware.org (Postfix) with ESMTP id E24053942024 for ; Thu, 12 Mar 2020 12:16:52 +0000 (GMT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-387-1IM6oRiuNjeVVGfDd7HGjA-1; Thu, 12 Mar 2020 08:16:50 -0400 X-MC-Unique: 1IM6oRiuNjeVVGfDd7HGjA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EB1681005509 for ; Thu, 12 Mar 2020 12:16:49 +0000 (UTC) Received: from tucnak.zalov.cz (ovpn-116-37.ams2.redhat.com [10.36.116.37]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7FB145D9E5; Thu, 12 Mar 2020 12:16:49 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.15.2/8.15.2) with ESMTP id 02CCGlfe027852; Thu, 12 Mar 2020 13:16:47 +0100 Received: (from jakub@localhost) by tucnak.zalov.cz (8.15.2/8.15.2/Submit) id 02CCGkn5027851; Thu, 12 Mar 2020 13:16:46 +0100 Date: Thu, 12 Mar 2020 13:16:46 +0100 To: David Malcolm Subject: [PATCH] maintainer-scripts: Fix jit documentation build with update_web_docs_git Message-ID: <20200312121646.GO2156@tucnak> MIME-Version: 1.0 User-Agent: Mutt/1.11.3 (2019-02-01) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Jakub Jelinek via Gcc-patches From: "Li, Pan2 via Gcc-patches" Reply-To: Jakub Jelinek Cc: gcc-patches@gcc.gnu.org Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Hi! scripts/update_web_docs_git -r 9.3.0 -d gcc-9.3.0 failed after the sourceware upgrade, there is no python-sphinx10 package and python3-sphinx is new enough that the docs build succeeded. Ok for trunk? 2020-03-12 Jakub Jelinek * update_web_docs_git: Use SPHINXBUILD=/usr/bin/sphinx-build rather than SPHINXBUILD=/usr/bin/sphinx-1.0-build. Jakub --- maintainer-scripts/update_web_docs_git.jj 2020-01-14 09:23:17.677789918 +0100 +++ maintainer-scripts/update_web_docs_git 2020-03-12 13:12:47.052639530 +0100 @@ -183,15 +183,16 @@ done # defaulting to "sphinx-build". # # sphinx is packaged in Fedora and EPEL 6 within "python-sphinx", +# in RHEL 8 within "python3-sphinx", # and in openSUSE within "python-Sphinx". # # For EPEL6, python-sphinx is sphinx 0.6.6, which is missing various # directives (e.g. ":c:macro:"), so we need the variant # python-sphinx10 package. The latter installs its executable as # /usr/bin/sphinx-1.0-build -# so we need to override SPHINXBUILD with this when invoking "make". +# so we needed to override SPHINXBUILD with this when invoking "make". pushd gcc/gcc/jit/docs -make SPHINXBUILD=/usr/bin/sphinx-1.0-build html || true +make SPHINXBUILD=/usr/bin/sphinx-build html || true popd cp -a gcc/gcc/jit/docs/_build/html jit mkdir -p $DOCSDIR/jit