[dpdk-stable] patch 'doc: fix build with latest meson' has been queued to LTS release 18.11.3

[Kevin Traynor]

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 <bruce.richardson at intel.com>
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 <alialnu at mellanox.com>
Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Luca Boccassi <bluca at debian.org>
---
 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 at dpdk.org