From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9290FA0613 for ; Tue, 27 Aug 2019 11:30:48 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8A7421C0AB; Tue, 27 Aug 2019 11:30:48 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id DA1471BFFB for ; Tue, 27 Aug 2019 11:30:46 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 56B7A1E309; Tue, 27 Aug 2019 09:30:46 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-48.ams2.redhat.com [10.36.117.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 15A1B5C1B2; Tue, 27 Aug 2019 09:30:44 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Ali Alnubani , Luca Boccassi , dpdk stable Date: Tue, 27 Aug 2019 10:29:41 +0100 Message-Id: <20190827093032.20423-4-ktraynor@redhat.com> In-Reply-To: <20190827093032.20423-1-ktraynor@redhat.com> References: <20190827093032.20423-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 27 Aug 2019 09:30:46 +0000 (UTC) Subject: [dpdk-stable] patch 'doc: fix build with latest meson' has been queued to LTS release 18.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/03/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/590e51e0300262b0e7b1a887edd1070e32724e3b Thanks. Kevin Traynor --- >From 590e51e0300262b0e7b1a887edd1070e32724e3b Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 5 Jul 2019 16:56:55 +0100 Subject: [PATCH] doc: fix build with latest meson [ upstream commit 87c95f044568a439175a3fa0becf83b52eed8820 ] The latest versions of meson don't build targets when build_by_default is false but install is true, unlike older versions. We can fix this by having both build_by_default and install settings come from the build-time option. Bugzilla ID: 303 Fixes: d02a2dab2dfb ("doc: support building HTML guides with meson") Fixes: 720b14db3ae2 ("build: generate API documentation with meson") Reported-by: Ali Alnubani Signed-off-by: Bruce Richardson Acked-by: Luca Boccassi --- doc/api/meson.build | 4 ++-- doc/guides/meson.build | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/api/meson.build b/doc/api/meson.build index 30bdc573b..1c48b7672 100644 --- a/doc/api/meson.build +++ b/doc/api/meson.build @@ -27,5 +27,5 @@ if doxygen.found() install: get_option('enable_docs'), install_dir: htmldir, - build_by_default: false) + build_by_default: get_option('enable_docs')) cdata = configuration_data() @@ -49,5 +49,5 @@ if doxygen.found() install: get_option('enable_docs'), install_dir: htmldir, - build_by_default: false) + build_by_default: get_option('enable_docs')) doc_targets += doxy_build diff --git a/doc/guides/meson.build b/doc/guides/meson.build index 06f14882b..7931ef3bb 100644 --- a/doc/guides/meson.build +++ b/doc/guides/meson.build @@ -12,5 +12,5 @@ if sphinx.found() '-d', meson.current_build_dir() + '/.doctrees', '@INPUT@', meson.current_build_dir() + '/guides'], - build_by_default: false, + build_by_default: get_option('enable_docs'), install: get_option('enable_docs'), install_dir: htmldir) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-27 09:40:11.148238825 +0100 +++ 0004-doc-fix-build-with-latest-meson.patch 2019-08-27 09:40:10.845146209 +0100 @@ -1 +1 @@ -From 87c95f044568a439175a3fa0becf83b52eed8820 Mon Sep 17 00:00:00 2001 +From 590e51e0300262b0e7b1a887edd1070e32724e3b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 87c95f044568a439175a3fa0becf83b52eed8820 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org