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 5049DA0487 for ; Fri, 5 Jul 2019 18:30:54 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0A4281BDF1; Fri, 5 Jul 2019 18:30:54 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id D23381B9F6; Fri, 5 Jul 2019 18:30:50 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id u18so10554496wru.1; Fri, 05 Jul 2019 09:30:50 -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=W1z3Y6PdTJZVMQFBxy9LSCQzxVLhBnZbEyZsF3+Fsa8=; b=Y9EP+jGg9qJerME3mNwiqI22c79S5Y+FKcqRws0bsfmaWHiMZKeqO2qUUj2kK6cgIp EmXcwXXdLcr54T7EKWJhjan2GZSgProJqJnq/JsbZ0C5nPxlz+b8vKwJKHwPRuIOaeJ8 vLDg6Hr0UGxDtYKbSJ8a7nL2FEEOCDxA/6s9eKIsWLWQX1KAHVyaXDO4mCvRdClOtWbC KDmmdz6NeteE1vwwpjLw3fNw7efrkZIIGY0lJ9Fa51mKckrBaUGNuyFduTmGy7wtk59N 1cnmQtmmtYtkTGyNORzf5CcCfQ1E/844229QQ/oX3z/1K0I8x1GgSvrVVbs+EB8sZtbd StBg== X-Gm-Message-State: APjAAAXgtLQTZyfD0rorBSNh3aASnO+Bu73l+9Bh6OvOrg9qPfquyhpU B8UM9kb2F149z7Ihkemz2l8= X-Google-Smtp-Source: APXvYqxg2aiOdwbfsLivlj7daAixsaijq4udCjMWJUUyERUltpCqg7jhrP77Ur2KrIdiWgWkAXaSZQ== X-Received: by 2002:adf:a55b:: with SMTP id j27mr4799052wrb.154.1562344250382; Fri, 05 Jul 2019 09:30:50 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id a84sm10270793wmf.29.2019.07.05.09.30.49 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 05 Jul 2019 09:30:49 -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:30:49 +0100 In-Reply-To: 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 17:18 +0100, Luca Boccassi wrote: > 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 > >=20 > > Cc:=20 > > stable@dpdk.org > >=20 > >=20 > > Cc:=20 > > alialnu@mellanox.com > >=20 > >=20 > >=20 > > Reported-by: Ali Alnubani < > > alialnu@mellanox.com > >=20 > >=20 > > Signed-off-by: Bruce Richardson < > > bruce.richardson@intel.com > >=20 > >=20 > > --- > > 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 >=20 > Mmh why do I feel a deja-vu? Did we already fix this in the past? lol it's my fault that's why: https://github.com/mesonbuild/meson/commit/26= 7792174c9921e6be296086b0c806a684432a1b --=20 Kind regards, Luca Boccassi