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 E54FEA0487 for ; Fri, 5 Jul 2019 18:18:54 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E41151BC07; Fri, 5 Jul 2019 18:18:53 +0200 (CEST) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id F1F501BC07; Fri, 5 Jul 2019 18:18:52 +0200 (CEST) Received: by mail-wr1-f67.google.com with SMTP id p13so10461442wru.10; Fri, 05 Jul 2019 09:18:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:content-transfer-encoding:user-agent:mime-version; bh=T59s+5P9DhB8OfXFPmRYpekk+lQNFEtcxLOl5cR6zOs=; b=jnTv40FXUqJcFJ1EHu6cIJeAqtlfGdRicPvBu4/AsdNZOrhnMtXYsJTH5FEbS7xyYn 0Br5N9mfQH56lMvhGw472gPyW8rNImcQ58PcNwwS6+0OrNw9Msz+2H32rC1WWSe+gvUO hK8nbDZGfnt15wkvsG543apckPXp78CaIhZC1DF26d9TsCWfCWFlh+Wak9aYOPN3bomU iILwnfrlj+mj5tWmVL9oH1hSr42Td0QiqGNgCMNC7Qtu6n8I6g5RdzncnmtIszOfBvfj /Ns5ND7W10xWWpRQEDVT95k4pZVFHP5528Xr/d7FHVhPsbZ8j4zMTDmjZwcx5Cfm6/tc Vy1g== X-Gm-Message-State: APjAAAU33AoE4CsiOipafp4DSppl3BPcGjA+vo9sEpOehL4B/k3oDtDg 49aFCVesPpD1ZHfXdaNB8lY= X-Google-Smtp-Source: APXvYqxzIEThEnBbhcPcoid4mAmVmPwDRnW+Gs1PWmxBc6D/vIibq0G9urcDTrGo6nW3hE+wAB24uQ== X-Received: by 2002:adf:de08:: with SMTP id b8mr4112632wrm.282.1562343532467; Fri, 05 Jul 2019 09:18:52 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id v124sm3991342wmf.23.2019.07.05.09.18.51 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 05 Jul 2019 09:18:51 -0700 (PDT) Message-ID: From: Luca Boccassi To: Bruce Richardson , dev@dpdk.org Cc: stable@dpdk.org, alialnu@mellanox.com Date: Fri, 05 Jul 2019 17:18:50 +0100 In-Reply-To: <20190705155655.31636-1-bruce.richardson@intel.com> References: <20190705155655.31636-1-bruce.richardson@intel.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.30.5-1.1 MIME-Version: 1.0 Subject: Re: [dpdk-stable] [PATCH] doc: fix doc build with latest meson 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" On Fri, 2019-07-05 at 16:56 +0100, Bruce Richardson wrote: > 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. >=20 > Bugzilla ID: 303 > Fixes: d02a2dab2dfb ("doc: support building HTML guides with meson") > Fixes: 720b14db3ae2 ("build: generate API documentation with meson") > Cc:=20 > bluca@debian.org >=20 > Cc:=20 > stable@dpdk.org >=20 > Cc:=20 > alialnu@mellanox.com >=20 >=20 > Reported-by: Ali Alnubani < > alialnu@mellanox.com > > > Signed-off-by: Bruce Richardson < > bruce.richardson@intel.com > > > --- > doc/api/meson.build | 4 ++-- > doc/guides/meson.build | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) >=20 > 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 > @@ -26,7 +26,7 @@ if doxygen.found() > command: [generate_examples, '@INPUT@', '@OUTPUT@'], > install: get_option('enable_docs'), > install_dir: htmldir, > - build_by_default: false) > + build_by_default: get_option('enable_docs')) > =20 > cdata =3D configuration_data() > cdata.set('VERSION', meson.project_version()) > @@ -48,7 +48,7 @@ if doxygen.found() > command: [generate_doxygen, '@INPUT@', '@OUTPUT@', > generate_css], > install: get_option('enable_docs'), > install_dir: htmldir, > - build_by_default: false) > + build_by_default: get_option('enable_docs')) > =20 > doc_targets +=3D doxy_build > doc_target_names +=3D 'Doxygen_API' > 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 > @@ -11,7 +11,7 @@ if sphinx.found() > command: [sphinx, '-b', 'html', > '-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) > =20 Mmh why do I feel a deja-vu? Did we already fix this in the past? --=20 Kind regards, Luca Boccassi