From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id DEFBCA0C4C; Tue, 23 Nov 2021 11:50:07 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6DA3940040; Tue, 23 Nov 2021 11:50:07 +0100 (CET) Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) by mails.dpdk.org (Postfix) with ESMTP id E3AFC4003C for ; Tue, 23 Nov 2021 11:50:05 +0100 (CET) Received: by mail-ed1-f51.google.com with SMTP id y13so90072997edd.13 for ; Tue, 23 Nov 2021 02:50:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:content-transfer-encoding:user-agent:mime-version; bh=UUmRcO5mNZADZmM4hLMdqhgwoG5ESkLFGDhDk8Ifzi8=; b=wg9VZvJoOjfuUKrOHtPxQDJPb9wGSMCi+pkrMCm+Qk/EWZERYTBlLeaMIm1Dw8FHIt IFHuT0NMDe7M1GVH8n6fwylQM3/SIu969XsiKnKn9LUYpQYqUPiRLS/fgBzHtj61Xilp Dy6B7wKMsR+p+u6EQdwgN/rj4ef7cIw0yErk5UJrGXJkl990ugWyxAQXO5JN1L5j+cxZ rw0F5bevPv3MdvEYalZay+w7LPVYlFITTPKIV/HTTAdKa8+Y+pZERKvSJRUn7Takq2th LMhauo+ZmPslT6iA6jEqY5CmuVZZ/8j1UEYJBH3mE+ko3Fr3BTMsVPx5LlKKoL/WJM0O /lPg== X-Gm-Message-State: AOAM532Uea2Y55P66b684R8h6FCV3JWcg9A1biizCyj8bpuxMQ7RCWcO u3L9LZE7d8/Zldy2eIkSU5E= X-Google-Smtp-Source: ABdhPJxq8UtZpqQUTHL01dJq4azaVw1d+HmYaYgLQ9lQTfyCmLkO2I44UOpgCeve3W2IFmjgFpYlqQ== X-Received: by 2002:a17:906:4fc4:: with SMTP id i4mr6789586ejw.81.1637664605685; Tue, 23 Nov 2021 02:50:05 -0800 (PST) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id h10sm5305760edk.41.2021.11.23.02.50.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Nov 2021 02:50:05 -0800 (PST) Message-ID: <3428b44098b0949f711a53c88b5d2f41f1281fa8.camel@debian.org> Subject: Re: [PATCH] doc: add build_root to STRIP_FROM_PATH From: Luca Boccassi To: Timothy Redaelli , Ferruh Yigit , Thomas Monjalon Cc: dev@dpdk.org Date: Tue, 23 Nov 2021 10:50:04 +0000 In-Reply-To: <1f6e95f1c4e148a18d8de8dc25d8bb63c094af60.1637612120.git.tredaelli@redhat.com> References: <1f6e95f1c4e148a18d8de8dc25d8bb63c094af60.1637612120.git.tredaelli@redhat.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.38.3-1+plugin MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org On Mon, 2021-11-22 at 21:16 +0100, Timothy Redaelli wrote: > examples.dox is built inside builddir and so doxygen generates some > dir_HASH.html that includes the builddir name and this may prevent DPDK > documentation to be correctly generated in some distributions, for > example CentOS Stream 9 and RHEL9, since the builddir includes the > architecture. >=20 > This commit adds builddir to STRIP_FROM_PATH in order to avoid > generating html files that includes it. >=20 > Fixes: a6090630f4e5 ("doc: automate examples file list for API") > Cc: ferruh.yigit@intel.com > Signed-off-by: Timothy Redaelli > --- > =C2=A0doc/api/doxy-api.conf.in | 1 + > =C2=A0doc/api/meson.build | 1 + > =C2=A02 files changed, 2 insertions(+) >=20 > diff --git a/doc/api/doxy-api.conf.in b/doc/api/doxy-api.conf.in > index db2ca9b6ed..a668cad687 100644 > --- a/doc/api/doxy-api.conf.in > +++ b/doc/api/doxy-api.conf.in > @@ -112,6 +112,7 @@ EXAMPLE_RECURSIVE =3D YES > =C2=A0 >=20 > =C2=A0OUTPUT_DIRECTORY =3D @OUTPUT@ > =C2=A0STRIP_FROM_PATH =3D @STRIP_FROM_PATH@ > +STRIP_FROM_PATH +=3D @BUILDDIR@ > =C2=A0GENERATE_HTML =3D YES > =C2=A0HTML_OUTPUT =3D @HTML_OUTPUT@ > =C2=A0GENERATE_LATEX =3D NO > diff --git a/doc/api/meson.build b/doc/api/meson.build > index d34c383694..6dda9bec46 100644 > --- a/doc/api/meson.build > +++ b/doc/api/meson.build > @@ -37,6 +37,7 @@ cdata.set('OUTPUT', join_paths(meson.build_root(), 'doc= ', 'api')) > =C2=A0cdata.set('HTML_OUTPUT', 'html') > =C2=A0cdata.set('TOPDIR', meson.source_root()) > =C2=A0cdata.set('STRIP_FROM_PATH', meson.source_root()) > +cdata.set('BUILDDIR', meson.build_root()) > =C2=A0cdata.set('WARN_AS_ERROR', 'NO') > =C2=A0if get_option('werror') > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0cdata.set('WARN_AS_ERROR', 'YES') Acked-by: Luca Boccassi --=20 Kind regards, Luca Boccassi